Merge pull request #4 from kimor79/multi_env

Support multiple env options
rvdh · Jun 24, 2014 · 75488be · 75488be
2 parents 805775d + 281beba
commit 75488be
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -168,6 +168,9 @@ key. See the hiera section below for examples.
 * `application_options`
    Extra options to set in the application config file
 
+* `environment_variables`
+   Extra environment variabls to set in the application config file
+
 #### Using Hiera
 
 Configure a django application:

diff --git a/manifests/app.pp b/manifests/app.pp
@@ -23,13 +23,17 @@
 # [*application_options*]
 #    Extra options to set in the application config file
 #
+# [*environment_variables*]
+#    Extra environment variables to set in the application config file
+#
 # === Authors
 # - Josh Smeaton <josh.smeaton@gmail.com>
 #
 define uwsgi::app (
-    $ensure              = 'present',
-    $template            = 'uwsgi/uwsgi_app.ini.erb',
-    $application_options = undef,
+    $ensure                = 'present',
+    $template              = 'uwsgi/uwsgi_app.ini.erb',
+    $application_options   = undef,
+    $environment_variables = undef,
     $uid,
     $gid
 ) {

diff --git a/templates/uwsgi_app.ini.erb b/templates/uwsgi_app.ini.erb
@@ -14,5 +14,12 @@ if @application_options
 <%
   end
 end
--%>
 
+if @environment_variables
+  @environment_variables.sort.each do |key, value|
+-%>
+env = <%= key %>=<%= value %>
+<%
+  end
+end
+-%>