Add a user variable to templates

This is a common configuration option and allows devstack (and others)
to configure a mod_wsgi user to run the daemon process.

Change-Id: Idf134b3bc6b08e3c3a80dde8830d5a4f3da5a06c
Fixes: bug 1226346

4 files changed, 12 insertions, 5 deletions

diff --git a/examples/apache2/account-server.template b/examples/apache2/account-server.template
index e39bf25b1..d4da3d807 100644
--- a/examples/apache2/account-server.template
+++ b/examples/apache2/account-server.template
@@ -2,17 +2,19 @@
 #
 # Change %PORT% to the port that you wish to use on your system
 # Change %SERVICENAME% to the service name you are using
+# Change %USER% to the system user that will run the daemon process
 # Change the debug level as you see fit
 #
 # For example:
 #     Replace %PORT% by 6012
 #     Replace %SERVICENAME% by account-server-1
+#     Replace %USER% with apache (or remove it for default)
 
 NameVirtualHost *:%PORT%
 Listen %PORT%
 
 <VirtualHost *:%PORT%>
-    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1
+    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1 user=%USER%
     WSGIProcessGroup %SERVICENAME%
     WSGIScriptAlias / /var/www/swift/%SERVICENAME%.wsgi
     WSGIApplicationGroup %{GLOBAL}
diff --git a/examples/apache2/container-server.template b/examples/apache2/container-server.template
index e4ff7ce2c..82fa281d3 100644
--- a/examples/apache2/container-server.template
+++ b/examples/apache2/container-server.template
@@ -2,17 +2,19 @@
 #
 # Change %PORT% to the port that you wish to use on your system
 # Change %SERVICENAME% to the service name you are using
+# Change %USER% to the system user that will run the daemon process
 # Change the debug level as you see fit
 #
 # For example:
 #     Replace %PORT% by 6011
 #     Replace %SERVICENAME% by container-server-1
+#     Replace %USER% with apache (or remove it for default)
 
 NameVirtualHost *:%PORT%
 Listen %PORT%
 
 <VirtualHost *:%PORT%>
-    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1
+    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1 user=%USER%
     WSGIProcessGroup %SERVICENAME%
     WSGIScriptAlias / /var/www/swift/%SERVICENAME%.wsgi
     WSGIApplicationGroup %{GLOBAL}
diff --git a/examples/apache2/object-server.template b/examples/apache2/object-server.template
index c8aaee1d5..a022389d4 100644
--- a/examples/apache2/object-server.template
+++ b/examples/apache2/object-server.template
@@ -2,18 +2,19 @@
 #
 # Change %PORT% to the port that you wish to use on your system
 # Change %SERVICENAME% to the service name you are using
+# Change %USER% to the system user that will run the daemon process
 # Change the debug level as you see fit
 #
 # For example:
 #     Replace %PORT% by 6010
 #     Replace %SERVICENAME% by object-server-1
-
+#     Replace %USER% with apache (or remove it for default)
 
 NameVirtualHost *:%PORT%
 Listen %PORT%
 
 <VirtualHost *:%PORT%>
-    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1
+    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1 user=%USER%
     WSGIProcessGroup %SERVICENAME%
     WSGIScriptAlias / /var/www/swift/%SERVICENAME%.wsgi
     WSGIApplicationGroup %{GLOBAL}
diff --git a/examples/apache2/proxy-server.template b/examples/apache2/proxy-server.template
index 4066ad60d..959d76ef9 100644
--- a/examples/apache2/proxy-server.template
+++ b/examples/apache2/proxy-server.template
@@ -2,11 +2,13 @@
 #
 # Change %PORT% to the port that you wish to use on your system
 # Change %SERVICENAME% to the service name you are using
+# Change %USER% to the system user that will run the daemon process
 # Change the debug level as you see fit
 #
 # For example:
 #     Replace %PORT% by 8080
 #     Replace %SERVICENAME% by proxy-server
+#     Replace %USER% with apache (or remove it for default)
 
 NameVirtualHost *:%PORT%
 Listen %PORT%
@@ -14,7 +16,7 @@ Listen %PORT%
 <VirtualHost *:%PORT%>
     # The limit of an object size
     LimitRequestBody 5368709122
-    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1
+    WSGIDaemonProcess %SERVICENAME% processes=5 threads=1 user=%USER%
     WSGIProcessGroup %SERVICENAME%
     WSGIScriptAlias / /var/www/swift/%SERVICENAME%.wsgi
     WSGIApplicationGroup %{GLOBAL}