Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/trac/manifests/init.pp

Issue 29362580: Issue 4641 - Append performance fix to trac cgi file (Closed)
Patch Set: Issue 4641 - Performance fix to trac cgi file Created Nov. 17, 2016, 9:43 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/trac/files/trac_performance_fix.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/trac/manifests/init.pp
===================================================================
--- a/modules/trac/manifests/init.pp
+++ b/modules/trac/manifests/init.pp
@@ -9,7 +9,9 @@
ensure => present
}
- include nginx, spawn-fcgi
+ include stdlib,
+ nginx,
+ spawn-fcgi
file {$fcgi_config_dir:
ensure => directory,
@@ -146,6 +148,15 @@
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 e
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 any
f.nicolaisen 2016/11/18 09:23:29 Acknowledged.
+ mode => 644,
+ }
+
+
define instance (
$config = 'trac/trac.ini.erb',
$description = 'Issue Tracker',
@@ -246,6 +257,14 @@
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 t
f.nicolaisen 2016/11/18 09:23:29 Puppet doesn't accept dropping it - the match also
+ require => Exec["deploy_$name"],
+ }
+
file {"/home/trac/htdocs-$name/htdocs/common/logo.png":
ensure => present,
source => $logo,
« no previous file with comments | « modules/trac/files/trac_performance_fix.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld