group_vars/pad.yaml

@@ -1 +0,0 @@
-etherpad_domain: pad.bitlair.nl

roles/services/handlers/main.yaml

@@ -24,9 +24,3 @@
     name: spacestated
     state: restarted
     daemon_reload: true
-
-- name: restart mastodon-spacestate
-  systemd:
-    name: mastodon-spacestate
-    state: restarted
-    daemon_reload: true

roles/services/tasks/ircbot.yaml

@@ -5,7 +5,6 @@
     version: master
     dest: /var/lib/irc-bot
     accept_hostkey: yes
-  notify: restart irc-bot
 
 - name: Link irc-say
   file:

roles/services/tasks/main.yaml

@@ -10,6 +10,3 @@
 
 - tags: services_spacestated
   import_tasks: spacestated.yaml
-
-- tags: services_mastodon_spacestate
-  import_tasks: mastodon_spacestate.yaml

roles/services/tasks/mastodon_spacestate.yaml

@@ -1,39 +0,0 @@
----
-- name: Install dependencies
-  apt:
-    name:
-      - python3-mastodon
-      - python3-paho-mqtt
-
-- name: Clone source
-  git:
-    repo: https://github.com/bitlair/mastodon-spacestate.git
-    version: main
-    dest: /var/lib/mastodon-spacestate
-    accept_hostkey: yes
-  notify: restart mastodon-spacestate
-
-- name: Install config
-  template:
-    src: mastodon-spacestate-config.py
-    dest: /var/lib/mastodon-spacestate/config.py
-    owner: root
-    group: root
-    mode: 0655
-  notify: restart mastodon-spacestate
-
-- name: Install service file
-  template:
-    src: mastodon-spacestate.service
-    dest: /etc/systemd/system/mastodon-spacestate.service
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart mastodon-spacestate
-
-- name: Start mastodon-spacestate
-  systemd:
-    name: mastodon-spacestate
-    state: started
-    enabled: yes
-    daemon_reload: true

roles/services/tasks/siahsd.yaml

@@ -3,22 +3,13 @@
 
 - name: Create directories
   file:
-    path: "{{ item }}"
+    path: /var/log/siahsd
     state: directory
     owner: siahsd
     group: nogroup
   with_items:
     - /var/log/siahsd
-    - /var/lib/siahsd
-
-- name: Install config file
-  template:
-    src: siahsd.conf
-    dest: /etc/siahsd.conf
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart siahsd
+    - /var/run/siahsd
 
 - name: Install service file
   template:

roles/services/tasks/spacestated.yaml

@@ -19,7 +19,6 @@
     version: main
     dest: /var/lib/spacestated/spacestated
     accept_hostkey: yes
-  notify: restart spacestated
 
 - name: Install service file
   template:

roles/services/templates/mastodon-spacestate-config.py

@@ -1,14 +0,0 @@
-mqtt_server = 'mqtt.bitlair.nl'
-mqtt_port = 1883
-
-spacestate_topic = 'bitlair/state'
-open_string = 'open'
-closed_string = 'closed'
-
-spacestate_profile_key = 'Spacestate'
-open_profile_field = 'Open! @ {}'
-closed_profile_field = 'Closed @ {}'
-
-profile_fields = [('Website', 'https://bitlair.nl/')]
-access_token = '{{ mastodon_spacestate_access_token }}'
-homeserver = 'https://hsnl.social'

roles/services/templates/mastodon-spacestate.service

@@ -1,15 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=Bitlair Spacestate propagation to Mastodon
-After=network.target
-
-[Service]
-Type=simple
-Restart=on-failure
-RestartSec=10s
-ExecStart=/var/lib/mastodon-spacestate/mastodon-spacestate.py
-DynamicUser=true
-
-[Install]
-WantedBy=multi-user.target

roles/services/templates/siahsd.conf

@@ -1,5 +1,5 @@
 [siahsd]
-pid file = /var/lib/siahsd/siahsd.pid
+pid file = /run/siahsd/siahsd.pid
 log file = /var/log/siahsd/siahsd.log
 log level = 3
 foreground = 0

roles/services/templates/siahsd.service

@@ -6,10 +6,9 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/lib/siahsd/siahsd.pid
+PIDFile=/var/run/siahsd/siahsd.pid
 Restart=always
 RestartSec=10s
-ExecStartPre=-/bin/rm /var/lib/siahsd/siahsd.pid
 ExecStart=/usr/local/src/siahsd/build/siahsd
 User=siahsd