Index: modules/trac/manifests/init.pp |
=================================================================== |
--- a/modules/trac/manifests/init.pp |
+++ b/modules/trac/manifests/init.pp |
@@ -2,6 +2,9 @@ |
$domain, |
$certificate, |
$private_key, |
+ $description = "Issue Tracker", |
+ $configuration = "trac/trac.ini.erb", |
+ $permissions = "puppet:///modules/trac/permissions.csv", |
$is_default = false) inherits private::trac { |
package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']: |
ensure => present |
@@ -49,7 +52,7 @@ |
} |
exec { 'trac_env': |
- command => "trac-admin /home/trac/environment initenv \"Adblock Plus issue tracker\" mysql://trac:${database_password}@localhost:3306/trac", |
+ command => "trac-admin /home/trac/environment initenv \"$description\" mysql://trac:${database_password}@localhost:3306/trac", |
require => [ |
Exec['install_trac'], |
Mysql_grant['trac@localhost/trac.*'] |
@@ -120,7 +123,7 @@ |
file {"/home/trac/environment/conf/trac.ini": |
ensure => present, |
- content => template('trac/trac.ini.erb'), |
+ content => template($configuration), |
owner => trac, |
require => Exec['trac_env'] |
} |
@@ -138,6 +141,13 @@ |
require => Exec['deploy'] |
} |
+ file {"/home/trac/htdocs/htdocs/common/eyeo_logo.png": |
+ ensure => present, |
+ source => 'puppet:///modules/trac/eyeo_logo.png', |
+ owner => trac, |
+ require => Exec['deploy'] |
+ } |
+ |
file {"/home/trac/environment/htdocs/theme.css": |
ensure => present, |
source => 'puppet:///modules/trac/theme.css', |
@@ -183,7 +193,6 @@ |
file {"/home/trac/permissions.csv": |
ensure => present, |
owner => trac, |
- source => 'puppet:///modules/trac/permissions.csv' |
+ source => $permissions, |
} |
- |
} |