diff --git a/roles/webapps/files/bin/scootaloo b/roles/webapps/files/bin/scootaloo index 89e436b..0c9b74c 100755 Binary files a/roles/webapps/files/bin/scootaloo and b/roles/webapps/files/bin/scootaloo differ diff --git a/roles/webapps/tasks/fcgiwrap.yml b/roles/webapps/tasks/fcgiwrap.yml deleted file mode 100644 index 71ed278..0000000 --- a/roles/webapps/tasks/fcgiwrap.yml +++ /dev/null @@ -1,9 +0,0 @@ -- name: install fcgiwrap - package: - name: fcgiwrap - state: present - -- name: start fcgiwrap - service: - name: fcgiwrap - state: started diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml index 157546b..6d1d5c5 100644 --- a/roles/webapps/tasks/main.yml +++ b/roles/webapps/tasks/main.yml @@ -19,6 +19,3 @@ - name: tootctl for mastodon include_tasks: tootctl.yml when: inventory_hostname == 'ror.dmz.mateu.be' -- name: fcgiwrap for mailman - include_tasks: fcgiwrap.yml - when: inventory_hostname == 'mail.dmz.mateu.be' diff --git a/roles/webapps/tasks/scootaloo.yml b/roles/webapps/tasks/scootaloo.yml index cc7152c..c8588c6 100644 --- a/roles/webapps/tasks/scootaloo.yml +++ b/roles/webapps/tasks/scootaloo.yml @@ -1,19 +1,11 @@ - name: install scootaloo copy: src: files/bin/scootaloo - dest: "/usr/local/bin/scootaloo" + dest: "{{ scootaloo_bin_path }}" owner: root group: www-data mode: 0750 -- name: create last tweet file - file: - path: /usr/local/etc/last_tweet - state: touch - owner: www-data - group: www-data - mode: 0750 - - name: put configuration file template: src: scootaloo.toml.j2 @@ -22,10 +14,23 @@ group: www-data mode: 0640 +- name: create scootaloo config dir + file: + path: "{{ scootaloo_db_path }}" + state: directory + owner: www-data + group: www-data + mode: 0750 + +- name: init scootaloo db + shell: + cmd: "{{ scootaloo_bin_path }} init" + creates: "{{ scootaloo_db_path }}/scootaloo.sqlite" + - name: cron for scootaloo cron: name: Scootaloo Dojo user: www-data minute: "*/5" - job: "/usr/local/bin/scootaloo > /dev/null" + job: "{{ scootaloo_bin_path }} > /dev/null" diff --git a/roles/webapps/templates/scootaloo.toml.j2 b/roles/webapps/templates/scootaloo.toml.j2 index 3ddd898..082bd01 100644 --- a/roles/webapps/templates/scootaloo.toml.j2 +++ b/roles/webapps/templates/scootaloo.toml.j2 @@ -1,6 +1,6 @@ [scootaloo] -last_tweet_path="/usr/local/etc/last_tweet" +last_tweet_path="/var/lib/scootaloo/scootaloo.sqlite" cache_path="/tmp/scootaloo" [twitter] diff --git a/roles/webapps/vars/main.yml b/roles/webapps/vars/main.yml new file mode 100644 index 0000000..564442f --- /dev/null +++ b/roles/webapps/vars/main.yml @@ -0,0 +1,4 @@ +--- + +scootaloo_bin_path: /usr/local/bin/scootaloo +scootaloo_db_path: /var/lib/scootaloo