Add support for uwsgi applications

Author: jarshwah

README.md

@@ -8,7 +8,8 @@ A puppet module for installing and managing uwsgi
 This module installs and configures [uWSGI](http://uwsgi-docs.readthedocs.org)
 in [Emperor mode](http://uwsgi-docs.readthedocs.org/en/latest/Emperor.html).
 
-It does not, currently, manage uwsgi applications (PRs welcome).
+It can also create and manage uwsgi applications that run under the emperor,
+which are best defined in hiera.
 
 Just about every option is configurable, so it should work on most distributions
 by putting together a hiera file.
@@ -30,6 +31,9 @@ parameters.
    Package state.
    Default: 'installed'
 
+   If 'absent' or 'purged', then remove the `service_file` and `config_file`
+   also
+
 * `package_provider`
    The provider to use to install the package.
    Default: 'pip'
@@ -97,8 +101,6 @@ parameters.
 
 #### Using Hiera
 
-Hiera can be (should be!) used to change any of the default uwsgi parameters.
-
 Sets up some custom options within the emperor config file:
 
 ```yaml
@@ -129,3 +131,85 @@ uwsgi::service_enable: false
 uwsgi::install_pip: false
 uwsgi::install_python_dev: false
 ```
+
+## Defined Types
+
+### uwsgi::app
+
+Responsible for creating uwsgi applications that run under the uwsgi emperor.
+You shouldn't need to use this type directly, as the `uwsgi` class will
+automatically create all applications defined in hiera under the uwsgi::app
+key. See the hiera section below for examples.
+
+#### Parameters
+
+* `ensure`
+   Ensure the config file exists. Default: 'present'
+
+* `template`
+   The template used to construct the config file.
+   Default: 'uwsgi/uwsgi_app.ini.erb'
+
+* `uid`
+   The user to run the application as. Required.
+   May be the user name, not just the id.
+
+* `gid`
+   The group to run the application as. Required.
+   May be the group name, not just the id.
+
+* `application_options`
+   Extra options to set in the application config file
+
+#### Using Hiera
+
+Configure a django application:
+
+```yaml
+---
+uwsgi::app:
+  django:
+    ensure: 'present'
+    uid: 'django'
+    gid: 'django'
+    application_options:
+      chdir: '/path/to/project'
+      module: 'mysite.wsgi:application'
+      socket: '/tmp/uwsgi_django.sock'
+      master: 'True'
+      vaccum: 'True'
+      max-requests: '5000'
+      buffer-size: '32768'
+      processes: 4
+      threads: 8
+```
+
+Configure multiple applications (all yaml files are aggregated using
+`hiera_hash`):
+
+```yaml
+# common.yaml
+---
+uwsgi::app:
+  django_1:
+    ensure: 'present'
+    uid: 'django'
+    gid: 'django'
+    application_options:
+      chdir: '/path/to/project'
+      module: 'mysite.wsgi:application'
+      socket: '/tmp/uwsgi_django.sock'
+
+
+# role_app_server.yaml
+---
+uwsgi::app:
+  django_2:
+    ensure: 'present'
+    uid: 'django'
+    gid: 'django'
+    application_options:
+      chdir: '/path/to/project2'
+      module: 'mysite.wsgi:application'
+      socket: '/tmp/uwsgi_django2.sock'
+```

manifests/app.pp

@@ -0,0 +1,46 @@
+# == Define: uwsgi::app
+#
+# Responsible for creating uwsgi applications. You shouldn't need to use this
+# type directly, as the main `uwsgi` class uses this type internally.
+#
+# === Parameters
+#
+# [*ensure*]
+#    Ensure the config file exists. Default: 'present'
+#
+# [*template*]
+#    The template used to construct the config file.
+#    Default: 'uwsgi/uwsgi_app.ini.erb'
+#
+# [*uid*]
+#    The user to run the application as. Required.
+#    May be the user name, not just the id.
+#
+# [*gid*]
+#    The group to run the application as. Required.
+#    May be the group name, not just the id.
+#
+# [*application_options*]
+#    Extra options 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,
+    $uid,
+    $gid
+) {
+
+    file { "${::uwsgi::app_directory}/${title}.ini":
+        ensure  => $ensure,
+        owner   => $uid,
+        group   => $gid,
+        mode    => '0644',
+        content => template($template),
+        require => Package[$::uwsgi::package_name],
+        notify  => Service[$::uwsgi::service_name]
+    }
+}

manifests/init.pp

@@ -13,6 +13,9 @@
 # [*package_ensure*]
 #    Package state. Default: 'installed'
 #
+#    If 'absent' or 'purged', then remove the `service_file` and `config_file`
+#    also
+#
 # [*package_provider*]
 #    The provider to use to install the package. Default: 'pip'
 #
@@ -108,8 +111,15 @@
         provider => $package_provider
     }
 
+    # remove config files if package is purged
+    $file_ensure = $package_ensure ? {
+        'absent' => 'absent',
+        'purged' => 'absent',
+        default  => 'present'
+    }
+
     file { $config_file:
-        ensure  => 'present',
+        ensure  => $file_ensure,
         owner   => 'root',
         group   => 'root',
         mode    => '0644',
@@ -118,7 +128,7 @@
     }
 
     file { $service_file:
-        ensure   => 'present',
+        ensure   => $file_ensure,
         owner    => 'root',
         group    => 'root',
         mode     => '0644',
@@ -127,6 +137,14 @@
         require  => Package[$package_name]
     }
 
+    file { $app_directory:
+        ensure  => 'directory',
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        require => Package[$package_name]
+    }
+
     service { $service_name:
         ensure     => $service_ensure,
         enable     => $service_enable,
@@ -143,4 +161,8 @@
             File[$service_file]
             ]
     }
+
+    # finally, configure any applications necessary
+    $applications = hiera_hash('uwsgi::app', {})
+    create_resources('uwsgi::app', $applications)
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "engage-uwsgi",
-  "version": "0.1.1",
+  "version": "0.9.0",
   "author": "jarshwah <josh.smeaton@gmail.com>",
   "summary": "Install and configure uwsgi in Emperor mode",
   "license": "MIT",

templates/uwsgi.ini.erb

@@ -6,7 +6,7 @@
 [uwsgi]
 socket = /run/uwsgi/uwsgi.socket
 pidfile = /run/uwsgi/uwsgi.pid
-emperor = <%= @app_config_dir %>
+emperor = <%= @app_directory %>
 emperor-tyrant = true
 master = true
 autoload = true

templates/uwsgi_app.ini.erb

@@ -7,8 +7,8 @@
 uid = <%= @uid %>
 gid = <%= @gid %>
 <%
-if @config
-  @config.sort.each do |key, value|
+if @application_options
+  @application_options.sort.each do |key, value|
 -%>
 <%= key %> = <%= value%>
 <%