files/trac/git-post-receive-hook templates/trac/trac.ini @@ -1,12 +1,6 @@ -[inherit] -file = /etc/trac/trac.ini +# customized puppet project trac.ini here : -[trac] -repository_dir = /srv/git/puppet +[header_logo] +alt = Customized alt -[project] -descr = Puppet configuration -name = puppet -[header_logo] -alt = Puppet configuration files/trac/trac.ini.puppet @@ -14,8 +14,8 @@ # # These files are defined into : # -# * files/trac/trac.ini.<project> (if available) -# * files/trac/trac.ini.project (by defaults, do not modify) +# * templates/trac/trac.ini +# * files/trac/trac.ini.<project> (customize this file) # * files/trac/trac.ini (global settings) # * files/trac/trac.defaults (do not modify, generated by trac) class trac { @@ -61,7 +61,7 @@ class trac { require => File["/var/lib/trac"] } - define project($repository_path = '') { + define project($repository_path = '', $description) { $real_repository_path = $repository_path ? { '' => "/srv/git/$name", default => $repository_path @@ -84,11 +84,13 @@ class trac { require => [File["/var/lib/trac/$name"], Package[trac-git]] } - # Install our trac.ini file for each project + # Install a trac.ini file for each project + # + # This file contains generated values and then the content of files/trac/trac.ini.$name file { "/var/lib/trac/$name/conf/trac.ini": owner => "www-data", group => "www-data", - source => [ "puppet:///files/trac/trac.ini.$name", "puppet:///files/trac/trac.ini.project" ], + content => template("trac/trac.ini"), require => [Exec["trac-initenv-$name"], File["/etc/trac/trac.ini"]] } @@ -110,12 +112,13 @@ class trac { } # Make git hook post-receive executable - file { "/srv/git/$name/hooks/post-receive": + # required a git::repository with the same name + file { "/srv/git/$name/hooks/post-receive": content => "#!/bin/sh sudo -u www-data /usr/share/trac/hooks/git-post-receive-hook /var/lib/trac/$name ", mode => 755, - require => Exec["git-init-$name"] + require => Git::Repository[$name] } } manifests/classes/trac.pp @@ -6,6 +6,7 @@ node 'sandbox' { line => "allow ^172\\.20\\.0\\.1$", require => Package["munin-node"] } + } node 'admin.dbx.tryphon.priv' { manifests/nodes.pp @@ -496,5 +496,5 @@ class dev-server inherits base-server { git::repository { puppet: } git::repository { studio: } - trac::project { puppet: } + trac::project { puppet: description => "Puppet configuration" } } manifests/templates.pp files/trac/trac.init.puppet c7855547a7c9be9a261203b1fc9067f09c9613cc Alban Peignier alban.peignier@free.fr http://github.com/albanpeignier/tryphon-puppet/commit/1d4f05a3e06c4c24ea93ba38c853578acd7f2c9f 1d4f05a3e06c4c24ea93ba38c853578acd7f2c9f 2009-10-07T08:29:21-07:00 2009-10-07T08:28:59-07:00 Use a template to generate the conf/trac.ini for each project 6e4d22f8c88943541b0f336c5ccfecfdc0862901 Alban Peignier alban.peignier@free.fr