#753 - set up an order system to let eyeo employees file order requests

modules/trac/manifests/init.pp

 class trac(
     $domain,
     $certificate,
     $private_key,
     $fcgi_config_dir = '/etc/nginx/trac.d',
     $is_default = false) inherits private::trac {
 
   package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']:
     ensure => present
   }
 
   include nginx, spawn-fcgi
 
   file {$fcgi_config_dir:
     ensure => directory,
     owner => 'root',
     mode => 755,
     require => Package['nginx'],
   }
 
   nginx::hostconfig {$domain:
-    source => 'puppet:///modules/trac/site.conf',
+    content => "include $fcgi_config_dir/*;",
     is_default => $is_default,
     certificate => $certificate,
     private_key => $private_key,
     log => 'access_log_trac',
     require => File[$fcgi_config_dir],
   }
 
   user {'trac':
     ensure => present,
     comment => 'User of the trac installation',
@@ skipping 77 matching lines @@
 
   exec { 'install_Tractags':
     command => "pip install svn+http://trac-hacks.org/svn/tagsplugin/tags/0.7/",
     require => Package['python-pip'],
     unless => "python -c 'import tractags'",
   }
 
   exec { 'install_PrivateTickets':
     command => "pip install svn+http://trac-hacks.org/svn/privateticketsplugin/tags/2.0.2/",
     require => Package['subversion', 'python-pip'],
-    unless => "python -c 'import privateticketsplugin'",
+    unless => "python -c 'import privatetickets'",
   }
 
   file { '/home/trac/trac.ini':
     ensure => present,
     source => 'puppet:///modules/trac/trac.ini',
     owner => 'trac',
     mode => 644,
   }
 
   define instance (
       $config = 'trac/trac.ini.erb',
       $description = 'Issue Tracker',
-      $environment = 'environment',
       $location = '/',
-      $logo = 'eyeo_logo.png',
+      $logo = 'puppet:///modules/trac/logo.png',
       $database = 'trac',
       $permissions = 'puppet:///modules/trac/permissions.csv',
       $theme = 'puppet:///modules/trac/theme.css') {
 
     $database_password = $private::trac::database_password
+    $environment = "environment-$name"
  
     mysql::db {$database:
       user => 'trac',
       password => $database_password,
       host => 'localhost',
       grant => ['all'],
       charset => 'utf8',
       collate => 'utf8_bin',
       require => Class['mysql::server'],
     }
 
-    $location_base = $location ? {
-        '/' => '',
-        default => $location,
-    }
+    $location_base = regsubst($location, '/+$', '')
 
     file {"${trac::fcgi_config_dir}/${name}.conf":
       ensure => file,
       owner => 'root',
       mode => 644,
-      content => "
-        location $location_base/
-        {
-          fastcgi_pass unix:/tmp/${name}-fastcgi.sock;
-          fastcgi_split_path_info ^(${location_base})(.*)\$;
-          include /etc/nginx/fastcgi_params;
-          fastcgi_param SCRIPT_NAME \$fastcgi_script_name;
-          fastcgi_param PATH_INFO \$fastcgi_path_info;
-          client_max_body_size 20m;
-        }
-        location $location_base/chrome/
-        {
-          alias /home/trac/htdocs-$name/htdocs/;
-        }",
+      content => template('trac/fcgi.conf.erb'),
       require => File[$trac::fcgi_config_dir],
+      notify => Service['nginx'],
     }
   
     exec {"trac_env_${name}":
       command => shellquote(
         'trac-admin', "/home/trac/$environment", 'initenv', $description,
         "mysql://trac:${database_password}@localhost:3306/$database"),
+      logoutput => true,
       path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
       require => [
         Exec['install_trac'],
         Mysql_grant["trac@localhost/${database}.*"]],
       user => trac,
-      unless => "test -d /home/trac/$environment"
+      unless => "test -d /home/trac/$environment",
     }
 
     file {"/home/trac/${environment}/conf/permissions.csv":
       ensure => present,
       owner => trac,
       source => $permissions,
       require => Exec["trac_env_$name"],
     }
   
     file {"/home/trac/$environment/conf/trac.ini":
@@ skipping 34 matching lines @@
         deploy /home/trac/htdocs-$name \
         && fromdos /home/trac/htdocs-$name/cgi-bin/trac.fcgi \
         && chmod 755 /home/trac/htdocs-$name/cgi-bin/trac.fcgi",
       user => trac,
       path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
       require => [
         Exec["update_env_$name"],
         Package["tofrodos"]],
     }
   
-    file {"/home/trac/htdocs-$name/htdocs/common/$logo":
-      ensure => present,
-      source => "puppet:///modules/trac/$logo",
+    file {"/home/trac/htdocs-$name/htdocs/common/logo.png":
+      ensure => present,
+      source => $logo,
       owner => trac,
       require => Exec["deploy_$name"],
     }
 
-    spawn-fcgi::pool {"${name}d":
+    spawn-fcgi::pool {"tracd_${name}":
       ensure => present,
       fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
       socket => "/tmp/${name}-fastcgi.sock",
       mode => "0666",
       user => trac,
       children => 1,
       require => Exec["deploy_$name"],
-      notify => Service['nginx'],
     }
   }
 }