From bf5183c36c71d47397b114a24dac99ee95801616 Mon Sep 17 00:00:00 2001
From: Thomas Merkel <tm@core.io>
Date: Mon, 11 Aug 2014 18:00:14 +0200
Subject: [PATCH] replace uwsgi with gunicorn

---
 copy/tmp/gunicorn.xml | 54 +++++++++++++++++++++++++++++++++++++++++++
 copy/tmp/uwsgi.xml    | 39 -------------------------------
 customize             |  8 +++----
 packages              |  2 +-
 4 files changed, 59 insertions(+), 44 deletions(-)
 create mode 100644 copy/tmp/gunicorn.xml
 delete mode 100644 copy/tmp/uwsgi.xml

diff --git a/copy/tmp/gunicorn.xml b/copy/tmp/gunicorn.xml
new file mode 100644
index 0000000..91df101
--- /dev/null
+++ b/copy/tmp/gunicorn.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='export'>
+  <service name='network/gunicorn' type='service' version='0'>
+    <dependency name='net-physical' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/physical'/>
+    </dependency>
+    <dependency name='filesystem' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local'/>
+    </dependency>
+    <exec_method name='start' type='method' exec='/opt/local/bin/gunicorn --log-syslog -D -b %{config/listen} -u %{config/user} -g %{config/group} -w %{config/worker} %{config/app}' timeout_seconds='0'/>
+    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='10'/>
+    <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='60'/>
+    <property_group name='startd' type='framework'>
+      <propval name='duration' type='astring' value='contract'/>
+      <propval name='ignore_error' type='astring' value='core,signal'/>
+    </property_group>
+    <instance name='default' enabled='false'>
+      <method_context working_directory='/tmp'>
+        <method_environment>
+          <envvar name='PATH' value='/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin:/bin'/>
+          <envvar name='PYTHONPATH' value='/opt/local/lib/python2.7/site-packages'/>
+        </method_environment>
+      </method_context>
+      <property_group name='config' type='application'>
+        <propval name='app' type='astring' value='default_wsgi:application'/>
+        <propval name='group' type='astring' value='www'/>
+        <propval name='listen' type='astring' value='127.0.0.1:8000'/>
+        <propval name='user' type='astring' value='www'/>
+        <propval name='worker' type='integer' value='1'/>
+      </property_group>
+    </instance>
+    <instance name='kumquat' enabled='true'>
+      <method_context working_directory='/opt/kumquat'>
+        <method_environment>
+          <envvar name='PATH' value='/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin:/bin'/>
+        </method_environment>
+      </method_context>
+      <property_group name='config' type='application'>
+        <propval name='app' type='astring' value='kumquat_web.wsgi:application'/>
+        <propval name='group' type='astring' value='www'/>
+        <propval name='listen' type='astring' value='127.0.0.1:9000'/>
+        <propval name='user' type='astring' value='www'/>
+        <propval name='worker' type='integer' value='1'/>
+      </property_group>
+    </instance>
+    <stability value='Evolving'/>
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>Gunicorn</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/copy/tmp/uwsgi.xml b/copy/tmp/uwsgi.xml
deleted file mode 100644
index 2d31bad..0000000
--- a/copy/tmp/uwsgi.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="uwsgi">
-	<service name="application/uwsgi" type="service" version="1">
-		<create_default_instance enabled="true"/>
-		<single_instance/>
-
-		<dependency name="network" grouping="require_all" restart_on="refresh" type="service">
-			<service_fmri value="svc:/milestone/network:default"/>
-		</dependency>
-
-		<dependency name="filesystem" grouping="require_all" restart_on="refresh" type="service">
-			<service_fmri value="svc:/system/filesystem/local"/>
-		</dependency>
-
-		<exec_method type="method" name="start" exec="/opt/local/bin/uwsgi-2.7 --emperor /opt/local/etc/uwsgi/" timeout_seconds="60">
-			<method_context working_directory='/opt/local/etc/uwsgi' project='default'>
-				<method_credential user='root' group='root'/>
-				<method_environment>
-					<envvar name='PATH' value='/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
-				</method_environment>
-			</method_context>
-		</exec_method>
-		<exec_method type="method" name="stop"	exec=":kill" timeout_seconds="60"/>
-
-		<property_group name="startd" type="framework">
-			<propval name="duration" type="astring" value="child"/>
-			<propval name="ignore_error" type="astring" value="core,signal"/>
-		</property_group>
-
-		<stability value="Evolving"/>
-		<template>
-			<common_name>
-				<loctext xml:lang="C">uwsgi emperor</loctext>
-			</common_name>
-		</template>
-
-	</service>
-</service_bundle>
diff --git a/customize b/customize
index e1f2360..ef42dcf 100755
--- a/customize
+++ b/customize
@@ -25,10 +25,10 @@ chown -R www:www /opt/kumquat
 echo "* Install missing dependencies via pip"
 pip install django django-bootstrap3
 
-# Setup uwsgi and nginx
-echo "* Setup uwsgi and nginx"
-mkdir -p /opt/local/etc/uwsgi
-svccfg import /tmp/uwsgi.xml
+# Setup gunicorn
+echo "* Setup gunicorn"
+mkdir -p /opt/local/etc/gunicorn
+svccfg import /tmp/gunicorn.xml
 
 # Remove unused httpd config files
 echo "* Remove unused httpd config files"
diff --git a/packages b/packages
index 55e0bb1..714e381 100644
--- a/packages
+++ b/packages
@@ -31,7 +31,7 @@ quickbackup-percona
 apache
 proftpd
 phpmyadmin
-py27-uwsgi
+py27-gunicorn
 py27-pip
 py27-passlib
 py27-pymysql