opendev/system-config
Code Issues Proposed changes

Start using puppet-cgit to manage cgitrc

Browse Source 
Instead of taking care of cgitrc configuration in system-config,
use the new embedded logic for puppet-cgit to set that
configuration.

Depends on puppet-cgit module, as the configuration was moved
there.

Depends-On: I5c8ef0e7036c4b7a33aa12dc502c048af0499dda
Change-Id: I0bdbbdc3689cc33981c9c74af4b6c3080acf2dbe
This commit is contained in:
Yolanda Robla 2015-05-11 11:07:32 +02:00 committed by yolanda.robla
parent 703238ad98
commit f2d0e3d799
2 changed files with 9 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
modules/openstack_project/files/git/cgitrc
View File

@ -1,87 +0,0 @@
#
# See cgitrc(5) or /usr/share/doc/cgit-*/cgitrc.5.html for details
#
# Enable caching of up to 1000 output entries
cache-size=1000
# Cache repository pages without a fixed SHA for one minute.
cache-dynamic-ttl=1
# Cache repo summary page for one minute.
cache-repo-ttl=1
# Cache cgit front page for one minute.
cache-root-ttl=1
# Specify some default clone prefixes
clone-prefix=git://git.openstack.org https://git.openstack.org
# Specify a command which will be invoked to format commit messages
commit-filter=/usr/local/bin/commit-filter.sh
# Specify the css url
css=/static/openstack.css
# Hide owner for each repository on the index page
enable-index-owner=0
# Show extra links for each repository on the index page
enable-index-links=1
# Disable dumb HTTP git protocol endoint
enable-http-clone=0
# Add a cgit favicon
favicon=/static/favicon.ico
# Use a custom logo
logo=/static/openstack.png
# Enable statistics per week, month and quarter
max-stats=quarter
# Set the title and heading of the repository index page
root-title=OpenStack git repository browser
# Make side-by-side diffs the default
side-by-side-diffs=1
# Set a subheading for the repository index page
root-desc=
# Include some more info about this site on the index page
#root-readme=/var/www/html/about.html
# Allow download of tar.gz, tar.bz2 and zip-files
#snapshots=tar.gz tar.bz2 zip
##
## List of common mimetypes
##
mimetype.gif=image/gif
mimetype.html=text/html
mimetype.jpg=image/jpeg
mimetype.jpeg=image/jpeg
mimetype.pdf=application/pdf
mimetype.png=image/png
mimetype.svg=image/svg+xml
# Enable syntax highlighting (requires the highlight package)
source-filter=/usr/libexec/cgit/filters/syntax-highlighting.sh
# Increase the number of entries to list per page on the repository
# index page (default 50)
max-repo-count=600
##
## List of repositories.
## PS: Any repositories listed when section is unset will not be
## displayed under a section heading
## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
## and included like this:
## include=/etc/cgitrepos
##
include=/etc/cgitrepos

17
modules/openstack_project/manifests/git_backend.pp
View File

@ -45,6 +45,15 @@ class openstack_project::git_backend (
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,
behind_proxy => $behind_proxy, behind_proxy => $behind_proxy,
cgitrc_settings => {
'clone_prefix' => 'git://git.openstack.org https://git.openstack.org',
'commit-filter' => '/usr/local/bin/commit-filter.sh',
'css' => '/static/openstack.css',
'favicon' => '/static/favicon.ico',
'logo' => '/static/openstack.png',
'root-title' => 'OpenStack git repository browser',
},
manage_cgitrc => true,
} }
# We don't actually use these variables in this manifest, but jeepyb # We don't actually use these variables in this manifest, but jeepyb
@ -52,14 +61,6 @@ class openstack_project::git_backend (
$local_git_dir = '/var/lib/git' $local_git_dir = '/var/lib/git'
$ssh_project_key = '' $ssh_project_key = ''
file { '/etc/cgitrc':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/openstack_project/git/cgitrc'
}
file { '/home/cgit/.ssh/': file { '/home/cgit/.ssh/':
ensure => directory, ensure => directory,
owner => 'cgit', owner => 'cgit',