Issue 4641 - Append performance fix to trac cgi file

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
+  include stdlib,
+    nginx,
+    spawn-fcgi
 
   file {$fcgi_config_dir:
     ensure => directory,
     owner => 'root',
     mode => 755,
     require => Package['nginx'],
   }
 
   nginx::hostconfig {$domain:
     content => "include $fcgi_config_dir/*;",
@@ skipping 116 matching lines @@
     mode => 644,
   }
 
   file {'/home/trac/robots.txt':
     ensure => 'present',
     source => 'puppet:///modules/trac/robots.txt',
     owner => 'trac',
     mode => 644,
   }
 
+  file {"trac_performance_fix_py":
+    ensure  => present,

[mathias, 2016/11/17 22:08:37]

Please do not align arrows. This is a documented exception from the Puppet Style
Guide (https://adblockplus.org/coding-style#puppet), introduced in order to
avoid changing unrelated lines in patch-sets.

[f.nicolaisen, 2016/11/18 09:23:29]

Acknowledged.

+    path    => '/usr/local/lib/python2.7/dist-packages/trac_performance_fix.py',
+    source  => 'puppet:///modules/trac/trac_performance_fix.py',
+    owner   => 'trac',

[mathias, 2016/11/17 22:08:36]

The owner should probably be set to 'root' for anything in '/usr/local/lib'. At
least as long as there is no necessity to do otherwise.

[f.nicolaisen, 2016/11/18 09:23:29]

Acknowledged.

+    mode => 644,
+  }
+
+
   define instance (
       $config = 'trac/trac.ini.erb',
       $description = 'Issue Tracker',
       $location = '/',
       $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
@@ skipping 80 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_line { "patch $name trac.fcgi":
+      path    => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
+      match   => '^# Author.*$',
+      line    => "# Author: Jonas Borgström <jonas@edgewall.com>
+import trac_performance_fix",

[mathias, 2016/11/17 22:08:36]

Wouldn't a "\n" do it here? Or, in order to keep the 80 chars but not
over-engineering stuff (i.e. using join() just for that sake), simply dropping
the matched line? Or just matching the first empty line?

[f.nicolaisen, 2016/11/18 09:23:29]

Puppet doesn't accept dropping it - the match also has to match the inserted
line. I'll try shortening it to 80 chars.

+      require => Exec["deploy_$name"],
+    }
+
     file {"/home/trac/htdocs-$name/htdocs/common/logo.png":
       ensure => present,
       source => $logo,
       owner => trac,
       require => Exec["deploy_$name"],
     }
 
     spawn-fcgi::pool {"tracd_${name}":
       ensure => present,
       fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
@@ skipping 13 matching lines @@
   # Daily restart required for log rotation of all instances at once
   cron {'restart-trac-daily':
     command => 'service spawn-fcgi restart >/tmp/spawn-fcgi-restart.log',
     environment => hiera('cron::environment', []),
     hour => '1',
     minute => '0',
     user => 'root',
   }
 }