From d29981584c09f831a2a40819745352eb55e12418 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Mon, 14 May 2012 16:25:40 -0400
Subject: [PATCH] Use template for Nginx in pypimirror module.

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
---
 modules/pypimirror/manifests/init.pp                            | 2 +-
 .../pypimirror/{files/default => templates/nginx_default.erb}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/pypimirror/{files/default => templates/nginx_default.erb} (68%)

diff --git a/modules/pypimirror/manifests/init.pp b/modules/pypimirror/manifests/init.pp
index 7f6d604c50..e4a5cdbe08 100644
--- a/modules/pypimirror/manifests/init.pp
+++ b/modules/pypimirror/manifests/init.pp
@@ -99,7 +99,7 @@ class pypimirror ( $base_url,
 
   file { "/etc/nginx/sites-available/default":
     ensure => present,
-    source => "puppet:///modules/pypimirror/default",
+    content => template('pypimirror/nginx_default.erb'),
     replace => true,
     owner => "root",
     group => "root",
diff --git a/modules/pypimirror/files/default b/modules/pypimirror/templates/nginx_default.erb
similarity index 68%
rename from modules/pypimirror/files/default
rename to modules/pypimirror/templates/nginx_default.erb
index 422a1c1532..efae989382 100644
--- a/modules/pypimirror/files/default
+++ b/modules/pypimirror/templates/nginx_default.erb
@@ -4,6 +4,6 @@ server {
   index index.html index.htm;
 
   location / {
-    root /usr/local/pypimirror;
+    root <%= mirror_file_path %>;
   }
 }