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 115 matching lines @@
     owner => 'trac',
     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,
+    path => '/usr/local/lib/python2.7/dist-packages/trac_performance_fix.py',
+    source => 'puppet:///modules/trac/trac_performance_fix.py',
+    owner => 'root',
+    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') {
 
@@ skipping 68 matching lines @@
         Exec['install_TicketTemplate'],
         Exec['install_NeverNotifyUpdater'],
         Exec['install_MasterTickets'],
         Exec['install_ThemeEngine'],
         Exec['install_Tractags'],
         Exec['install_TracSpamFilter'],
         Exec['install_PrivateTickets'],
         Exec['install_TracXMLRPC'],
         Exec['install_TracHTTPAuth']],
     }
-
+  
     exec {"deploy_$name":
       command => "trac-admin /home/trac/$environment \
         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/cgi-bin/trac_performance_fix.snippet":

[mathias, 2016/11/17 07:43:31]

Why not using a target path like
/usr/local/lib/python2.7/dist-packages/trac_monkey_patches.py or similar? That
would allow for patching using a simple include statement, which can be inserted
with a file_line resource (from Puppetlabs stdlib).

[f.nicolaisen, 2016/11/17 08:23:46]

Nice. Yeah, we can try doing that instead of exec/sed. I don't think file_line
can read contents from files though, so the snippet will have to be a value
inside this file again.

[mathias, 2016/11/17 10:18:33]

It should be possible, something like this one:

    file_line {"patch $name trac.fcgi":
      after => "^# Author:",
      line => "import trac_monkey_patches",
      path => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
    }

[f.nicolaisen, 2016/11/17 10:54:31]

OK, I'll try. Thanks!

-      ensure => present,
-      source => 'puppet:///modules/trac/trac_performance_fix.snippet',
-      owner => trac,
+  
+    file_line { "patch $name trac.fcgi":
+      path => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
+      match => '^# Author.*$',
+      line => "# Author\nimport trac_performance_fix",
       require => Exec["deploy_$name"],
-    }
-
-    exec {"append_cgi_config_to_$name":

[mathias, 2016/11/17 07:43:31]

It isn't really appending any more.

[f.nicolaisen, 2016/11/17 08:23:46]

True that, will fix.

-      command        => "sed -i '/# Author: Jonas Borgström <jonas@edgewall.com>/r trac_performance_fix.snippet' trac.fcgi",
-      cwd            => "/home/trac/htdocs-$name/cgi-bin/",
-      user           => trac,
-      path           => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
-      require        => File["/home/trac/htdocs-$name/cgi-bin/trac_performance_fix.snippet"],

[Wladimir Palant, 2016/11/16 17:02:52]

This should also require Exec["deploy_$name"], it cannot run earlier than
deployment.

[f.nicolaisen, 2016/11/16 17:04:55]

The File has that require, so this is transitively already the case. Should I
add the same require here for the sake of clarity?

[Wladimir Palant, 2016/11/16 18:57:32]

Ah, I didn't notice this.

     }
 
     file {"/home/trac/htdocs-$name/htdocs/common/logo.png":
       ensure => present,
       source => $logo,
       owner => trac,
       require => Exec["deploy_$name"],
     }
 
     spawn-fcgi::pool {"tracd_${name}":
@@ skipping 15 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',
   }
 }