From 3f3ec207f36cf0c1a3e28c7de4ba8692192281fd Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 4 Apr 2016 23:21:36 +0000
Subject: [PATCH] Revert "Refactor the code deploying zodbot/ursabot"

This reverts commit 0f2789a93812cad66ced746746757dfed83e8d87.
---
 roles/supybot/tasks/main.yml | 36 ++++++++++++++++++++++++++++--------
 roles/supybot/vars/main.yml  |  3 ---
 2 files changed, 28 insertions(+), 11 deletions(-)
 delete mode 100644 roles/supybot/vars/main.yml

diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml
index 36bfce931f..59cc5eaad0 100644
--- a/roles/supybot/tasks/main.yml
+++ b/roles/supybot/tasks/main.yml
@@ -10,23 +10,34 @@
   - packagedb-cli
   tags: supybot
 
-- set_fact: botname=botnames[env]
-
 - name: creating zodbot log dir
   file: path={{ item }} state=directory owner=daemon
   with_items:
-  - /var/lib/{{ botname }}
-  - /var/lib/{{ botname }}/conf
-  - /var/lib/{{ botname }}/data
-  - /var/lib/{{ botname }}/logs
+  - /var/lib/zodbot
+  - /var/lib/zodbot/conf
+  - /var/lib/zodbot/data
+  - /var/lib/zodbot/logs
   - /srv/web
   - /srv/web/meetbot
+  when: env != "staging"
   tags: supybot
 
 - name: create teams directory
   file: path=/srv/web/meetbot/teams state=directory owner=apache group=apache mode=0755
   tags: supybot
 
+- name: creating usrabot log dir
+  file: path={{ item }} state=directory owner=daemon
+  with_items:
+  - /var/lib/ursabot
+  - /var/lib/ursabot/conf
+  - /var/lib/ursabot/data
+  - /var/lib/ursabot/logs
+  - /srv/web
+  - /srv/web/meetbot
+  when: env == "staging"
+  tags: supybot
+
 - name: setup meetings_by_team script
   copy: src=meetings_by_team.sh dest=/usr/local/bin/meetings_by_team.sh mode=755
   tags: supybot
@@ -59,9 +70,18 @@
   - meetbot
   - supybot
 
-- name: setup cron job to start {{ botname }}/ursabot on boot
-  cron: name={{ botname }} special_time=reboot job='cd /srv/web/meetbot; supybot -d /var/lib/{{ botname }}/conf/{{ botname }}.conf' user=daemon
+- name: setup cron job to start zodbot/ursabot on boot
+  cron: name=zodbot special_time=reboot job='cd /srv/web/meetbot; supybot -d /var/lib/zodbot/conf/zodbot.conf' user=daemon
   tags:
   - config
   - meetbot
   - supybot
+  when: env != "staging"
+
+- name: setup cron job to start zodbot/ursabot on boot
+  cron: name=ursabot special_time=reboot job='cd /srv/web/meetbot; supybot -d /var/lib/ursabot/conf/ursabot.conf' user=daemon
+  tags:
+  - config
+  - meetbot
+  - supybot
+  when: env == "staging"
diff --git a/roles/supybot/vars/main.yml b/roles/supybot/vars/main.yml
deleted file mode 100644
index 6e3df9985c..0000000000
--- a/roles/supybot/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-botnames:
-  staging: ursabot
-  production: zodbot