From bfd0fb7f71284f9df96020f3c348f693161c39aa Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Wed, 1 Jul 2015 22:34:13 +0200
Subject: [PATCH] vo: harmonise la conf intranet2 avec celle d'o2

---
 Metadata/groups.xml                         | 11 ++++++++++-
 Python/etc/cron.daily/git_dirty_repo        |  2 +-
 Python/etc/monit/services                   |  5 +++++
 Python/etc/systemd/system/intranet2.service |  9 +++------
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 863242b..e6d41dc 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -387,6 +387,7 @@
 
   <Group name="o2"
          profile="true">
+    <!-- à activer vers jessie: <Group name="intranet2-service"/>-->
     <Group name="crans-vm-wheezy"/>
     <Group name="intranet2-server"/>
     <Group name="https_cert"/>
@@ -1598,7 +1599,15 @@
 </Group>
 
 <Group name="intranet2-dev">
-     <Bundle name="intranet2-service"/>
+    <Group name="intranet2-service"/>
+    <Group name="nginx"/> <!-- Pour l'intranet -->
+    <Group name="gunicorn"/>
+    <Group name="secrets-acl"/>
+    <Bundle name="quota"/>
+</Group>
+
+<Group name="intranet2-service">
+    <Bundle name="intranet2-service"/>
 </Group>
 
 
diff --git a/Python/etc/cron.daily/git_dirty_repo b/Python/etc/cron.daily/git_dirty_repo
index 1eb4b40..c822fdf 100644
--- a/Python/etc/cron.daily/git_dirty_repo
+++ b/Python/etc/cron.daily/git_dirty_repo
@@ -28,5 +28,5 @@ if has("vert"):
 if has("news-server"):
     out('%s --untracked-weekly --repository=/var/www --from="%s" --to="%s"' % (notifier_path, default_from, default_to))
 
-if has("intranet2-server"):
+if has("intranet2-service"):
     out('%s --untracked-weekly --repository=/usr/local/django/intranet --from="%s" --to="%s"' % (notifier_path, default_from, default_to))
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 295f59a..a9c69eb 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -89,6 +89,11 @@ if has('radio'):
     service(None, name='radio-vlc', start_cmd = "/etc/init.d/radio start", stop_cmd = "/etc/init.d/radio stop", pidp='/tmp/multicast.pid')
     service(None, name='radio-igmp', start_cmd = "/etc/init.d/igmp start", stop_cmd = "/etc/init.d/igmp stop", pidf='igmp')
 
+service('intranet2-service',
+    name="intranet2",
+    pidp='/run/gunicorn/intranet2.pid',
+)
+
 if has('gunicorn'):
     # on utilise le prob gunicorn-debian, qui liste les sites actifs sur
     # /etc/gunicorn.d/
diff --git a/Python/etc/systemd/system/intranet2.service b/Python/etc/systemd/system/intranet2.service
index cdaf243..3fa040e 100644
--- a/Python/etc/systemd/system/intranet2.service
+++ b/Python/etc/systemd/system/intranet2.service
@@ -24,12 +24,9 @@ After=network-online.target
 Type=forking
 User=root
 Group=root
-PIDFile=/run/gunicorn/intranet2.pid""")
-if has('intranet2-dev'):
-    out("""WorkingDirectory=/localhome/django/intranet-dev/""")
-if has('intranet2-server'):
-    out("""WorkingDirectory=/usr/local/intranet/""")
-out("""ExecStart=/usr/bin/gunicorn wsgi:application --pid=/run/gunicorn/intranet2.pid --name www-data --user www-data --group www-data --daemon --log-file /var/log/gunicorn/intranet2.log --log-level=info --bind=unix:///tmp/gunicorn-intranet.sock --workers=1
+PIDFile=/run/gunicorn/intranet2.pid
+WorkingDirectory=/usr/local/django/intranet/
+ExecStart=/usr/bin/gunicorn wsgi:application --pid=/run/gunicorn/intranet2.pid --name www-data --user www-data --group www-data --daemon --log-file /var/log/gunicorn/intranet2.log --log-level=info --bind=unix:///tmp/gunicorn-intranet.sock --workers=1
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s TERM $MAINPID
 Restart=on-failure