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

Delta Between Two Patch Sets: modules/trac/manifests/init.pp

Issue 5731052198821888: #1203 - Establish nginx::hostconfig-fragment() directive (Closed)
Left Patch Set: #1203 - Migrate Trac setup to nginx::hostconfig-fragment Created Aug. 13, 2014, 9:24 a.m.
Right Patch Set: #1203 - Establish nginx::hostconfig-fragment() directive Created Aug. 18, 2014, 10:01 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « modules/nginx/templates/site.erb ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 class trac( 1 class trac(
2 $domain, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $is_default = false) inherits private::trac { 5 $is_default = false) inherits private::trac {
6 6
7 package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']: 7 package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']:
8 ensure => present 8 ensure => present
9 } 9 }
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 password => $database_password, 134 password => $database_password,
135 host => 'localhost', 135 host => 'localhost',
136 grant => ['all'], 136 grant => ['all'],
137 charset => 'utf8', 137 charset => 'utf8',
138 collate => 'utf8_bin', 138 collate => 'utf8_bin',
139 require => Class['mysql::server'], 139 require => Class['mysql::server'],
140 } 140 }
141 141
142 $location_base = regsubst($location, '/+$', '') 142 $location_base = regsubst($location, '/+$', '')
143 143
144 nginx::hostconfig-fragment {"nginx_fragment_$name": 144 nginx::hostconfig-fragment {$name:
145 content => template('trac/fcgi.conf.erb'), 145 content => template('trac/fcgi.conf.erb'),
146 domain => $trac::domain, 146 domain => $trac::domain,
147 } 147 }
148 148
149 exec {"trac_env_${name}": 149 exec {"trac_env_${name}":
150 command => shellquote( 150 command => shellquote(
151 'trac-admin', "/home/trac/$environment", 'initenv', $description, 151 'trac-admin', "/home/trac/$environment", 'initenv', $description,
152 "mysql://trac:${database_password}@localhost:3306/$database"), 152 "mysql://trac:${database_password}@localhost:3306/$database"),
153 logoutput => true, 153 logoutput => true,
154 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', 154 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi", 223 fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
224 socket => "/tmp/${name}-fastcgi.sock", 224 socket => "/tmp/${name}-fastcgi.sock",
225 mode => "0666", 225 mode => "0666",
226 user => trac, 226 user => trac,
227 children => 1, 227 children => 1,
228 require => Exec["deploy_$name"], 228 require => Exec["deploy_$name"],
229 } 229 }
230 } 230 }
231 } 231 }
232 232
LEFTRIGHT

Powered by Google App Engine
This is Rietveld