baserock_webserver/instance-irclogs-config.yml: ubuntu wip

1 files changed, 31 insertions, 14 deletions

diff --git a/baserock_webserver/instance-irclogs-config.yml b/baserock_webserver/instance-irclogs-config.yml
index d64f32e8..1a687397 100644
--- a/baserock_webserver/instance-irclogs-config.yml
+++ b/baserock_webserver/instance-irclogs-config.yml
@@ -4,28 +4,30 @@
   vars_files:
   - irclogs/brlogger_secrets.yml
   tasks:
-  - name: Install Supybot
-    dnf: name=supybot state=latest
+  - name: Install Supybot from pip
+    pip:
+      name: supybot
+      executable: pip2
     become: yes
     become_user: root
 
-
   - name: Check for MeetBot install
     stat:
-      path: /usr/lib/python2.7/site-packages/supybot/plugins/MeetBot
+      path: /usr/local/lib/python2.7/dist-packages/supybot/plugins/MeetBot
     register: meetbot
 
   - name: Install MeetBot
     block:
       - git:
-          repo: 'https://github.com/openstack-infra/meetbot.git'
+          repo: 'https://opendev.org/opendev/meetbot.git'
           dest: /tmp/meetbot
+          version: 01e051648c2759c03f2a907552af8e4410abcde9
       - command: mv /tmp/meetbot/ircmeeting /tmp/meetbot/MeetBot/
         args:
           creates: /tmp/meetbot/Meetbot/ircmeeting
       - synchronize:
           src: /tmp/meetbot/MeetBot
-          dest: /usr/lib/python2.7/site-packages/supybot/plugins
+          dest: /usr/local/lib/python2.7/dist-packages/supybot/plugins
         delegate_to: "{{ inventory_hostname }}"
     become: yes
     become_user: root
@@ -34,32 +36,43 @@
   - name: MeetBot configuration
     copy:
       src: irclogs/meetingLocalConfig.py
-      dest: /usr/lib/python2.7/site-packages/supybot/plugins/MeetBot/ircmeeting/meetingLocalConfig.py
+      dest: /usr/local/lib/python2.7/dist-packages/supybot/plugins/MeetBot/ircmeeting/meetingLocalConfig.py
     become: yes
     become_user: root
 
-  - name: Install irclog2html
-    dnf: name=irclog2html state=latest
+
+  - name: Install Supybot from pip
+    pip:
+      name: irclog2html
+      executable: pip3
     become: yes
     become_user: root
 
   - name: supybot user
-    user: name=supybot
+    user:
+      name: supybot
     become: yes
     become_user: root
 
   - name: /srv/irclogs.baserock.org/
-    file: path=/srv/irclogs.baserock.org/ owner=supybot state=directory
+    file:
+      path: /srv/irclogs.baserock.org/
+      owner: supybot
+      state: directory
     become: yes
     become_user: root
 
   - name: supybot configuration
-    template: src=irclogs/supybot-baserock.conf dest=/home/supybot/supybot-baserock.conf owner=supybot
+    template:
+      src: "irclogs/supybot-baserock.conf"
+      dest: "/home/supybot/supybot-baserock.conf"
     become: yes
     become_user: supybot
 
   - name: install systemd units
-    copy: src=./irclogs/{{item}} dest=/etc/systemd/system/{{item}}
+    copy:
+      src: ./irclogs/{{item}}
+      dest: /etc/systemd/system/{{item}}
     become: yes
     become_user: root
     with_items:
@@ -68,7 +81,11 @@
       - supybot.service
 
   - name: enable systemd units
-    systemd: name={{item}} enabled=yes daemon_reload=yes state=started
+    systemd:
+      name: "{{item}}"
+      enabled: yes
+      daemon_reload: yes
+      state: started
     become: yes
     become_user: root
     with_items: