opendev/system-config
Code Issues Proposed changes

Use template for Nginx in pypimirror module.

Browse Source 
Fixes bug 999242.

No longer make Nginx default site config file a
static file. Instead, use a template that correctly
sets the document root.

Change-Id: Ib4a21319e78dc905cb33514a1371d7719be0380a
This commit is contained in:
David Shrewsbury 2012-05-14 16:25:40 -04:00
parent f212c0895d
commit d29981584c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/pypimirror/manifests/init.pp
View File

@ -99,7 +99,7 @@ class pypimirror ( $base_url,
file { "/etc/nginx/sites-available/default": file { "/etc/nginx/sites-available/default":
ensure => present, ensure => present,
source => "puppet:///modules/pypimirror/default", content => template('pypimirror/nginx_default.erb'),
replace => true, replace => true,
owner => "root", owner => "root",
group => "root", group => "root",

2
modules/pypimirror/files/default → modules/pypimirror/templates/nginx_default.erb
View File

@ -4,6 +4,6 @@ server {
index index.html index.htm; index index.html index.htm;
location / { location / {
root /usr/local/pypimirror; root <%= mirror_file_path %>;
} }
} }