services/discord_bot: New bottle-clip implementation

bitlair.yaml

@@ -58,6 +58,7 @@
 
 - hosts: services
   roles:
+    - { role: "deb_forgejo", tags: [ "deb_forgejo" ] }
     - { role: "services", tags: ["services"] }
 
 - hosts: wiki

group_vars/all.yaml

@@ -37,5 +37,7 @@ debian_repourl: "http://deb.debian.org/debian/"
 debian_securityurl: "http://security.debian.org/debian-security"
 
 deb_forgejo_repos:
+  - host: git.bitlair.nl
+    owner: bitlair
   - host: git.polyfloyd.net
     owner: polyfloyd

roles/bank/defaults/main.yaml

@@ -1,3 +1,3 @@
 bank_user: bank
-bank_revbank_git: https://git.bitlair.nl/bitlair/revbank.git
 bank_local_tty: no
+bank_revbank_version: "10.3.0"

roles/bank/tasks/login.yaml

@@ -4,7 +4,7 @@
     name: bank
     password: $6$idklol$QrOE/21LDR0vhZBAXwgA7AvnmR6Ju4ZqzAzgeazC08i2yw9kyQjgwu.uuV692iL/cyE7AteDYUxCpcorONXom. # "bank"
     home: /home/{{ bank_user }}
-    shell: /home/{{ bank_user }}/revbank.git/revbank
+    shell: /usr/local/share/revbank/revbank
     update_password: always
 
 - name: Allow password auth for bank user
@@ -13,7 +13,7 @@
     insertafter: EOF
     validate: "/usr/sbin/sshd -t -f %s"
     block: |-
-      Match User bank
+      Match User {{ bank_user }}
           PasswordAuthentication yes
   notify: reload sshd
 

roles/bank/tasks/revbank.yaml

@@ -1,50 +1,22 @@
 ---
 - name: Install dependencies
   ansible.builtin.apt:
-    name: [ git, libterm-readline-gnu-perl, libcurses-ui-perl, qrencode ]
+    name: [ git, libterm-readline-gnu-perl, libcurses-ui-perl ]
     state: present
 
 - name: Clone revbank source
   ansible.builtin.git:
-    repo: "{{ bank_revbank_git }}"
-    version: master
-    dest: /home/{{ bank_user }}/revbank.git
+    repo: https://github.com/revspace/revbank.git
+    version: "v{{ bank_revbank_version }}"
+    dest: /usr/local/share/revbank
     accept_hostkey: yes
 
-- name: Create data files
-  ansible.builtin.command: cp /home/{{ bank_user }}/revbank.git/{{ item }} /home/{{ bank_user }}/{{ item }}
-  args:
-    creates: /home/{{ bank_user }}/{{ item }}
-  with_items:
-    - revbank.accounts
-    - revbank.market
-    - revbank.products
-
-- name: Ensure data file permissions
-  ansible.builtin.file:
-    path: /home/{{ bank_user }}/{{ item }}
-    state: touch
-    owner: "{{ bank_user }}"
-    group: "{{ bank_user }}"
-    mode: 0644
-  with_items:
-    - revbank.accounts
-    - revbank.market
-    - revbank.products
-
-- name: Link plugins
-  ansible.builtin.file:
-    state: link
-    path: /home/{{ bank_user }}/{{ item }}
-    src: /home/{{ bank_user }}/revbank.git/{{ item }}
-  with_items:
-    - plugins
-    - revbank.plugins
-
-- name: Create git data dir
-  ansible.builtin.file:
-    path: /home/{{ bank_user }}/data.git
-    state: directory
+- name: Clone revbank-plugin source
+  ansible.builtin.git:
+    repo: https://git.bitlair.nl/bitlair/revbank-plugins.git
+    version: main
+    dest: /usr/local/share/revbank-plugins
+    accept_hostkey: yes
 
 - name: Install git cronjob
   ansible.builtin.template:

roles/bank/templates/git.cron

@@ -1,4 +1,4 @@
 SHELL=/bin/bash
 
 #m    h  dom mon dow user             command
- */10 *  *   *   *   {{ bank_user }} (cd /home/{{ bank_user }}/data.git && git pull -r && git push && git gc --auto && cp revbank.products ../revbank.products)
+ */10 *  *   *   *   {{ bank_user }}  git -C ~/.revbank pull -r && git -C ~/.revbank push

roles/services/tasks/discord_bot.yaml

@@ -3,30 +3,36 @@
 - name: Install dependencies
   ansible.builtin.apt:
     name:
-      - python3-paho-mqtt
-      - python3-tz
+      - openscad
       - virtualenv
 
 - name: Create virtualenv
   ansible.builtin.command:
-    cmd: virtualenv /opt/miflora_exporter/.venv
+    cmd: virtualenv /var/lib/discord-bot/.venv
   args:
     creates: /var/lib/discord-bot/.venv
 
-- name: Install Python dependencies
-  ansible.builtin.shell:
-    cmd: . .venv/bin/activate && pip install -r requirements.txt
-  args:
-    chdir: /var/lib/discord-bot
+- name: Clone bottleclip source
+  ansible.builtin.git:
+    repo: https://git.bitlair.nl/bitlair/bottle-clip.git
+    version: main
+    dest: /var/lib/bottle-clip
+    accept_hostkey: yes
+  notify: Restart discord-bot
 
-- name: Clone source
+- name: Clone discord-bot source
   ansible.builtin.git:
     repo: https://git.bitlair.nl/bitlair/discord-bot.git
     version: main
     dest: /var/lib/discord-bot
     accept_hostkey: yes
   notify: Restart discord-bot
-  ignore_errors: true
+
+- name: Install Python dependencies
+  ansible.builtin.shell:
+    cmd: . .venv/bin/activate && pip install -r requirements.txt
+  args:
+    chdir: /var/lib/discord-bot
 
 - name: Install service file
   ansible.builtin.template:

roles/services/tasks/siahsd.yaml

@@ -1,16 +1,15 @@
 ---
-# TODO: Install and build
+- name: Install siahsd
+  apt:
+    name: siahsd
 
 - name: Create directories
   ansible.builtin.file:
-    path: "{{ item }}"
+    path: /var/log/siahsd
     state: directory
     owner: siahsd
     group: nogroup
     mode: "0750"
-  with_items:
-    - /var/log/siahsd
-    - /var/lib/siahsd
 
 - name: Install config file
   ansible.builtin.template:
@@ -21,19 +20,9 @@
     mode: "0644"
   notify: Restart siahsd
 
-- name: Install service file
-  ansible.builtin.template:
-    src: siahsd.service
-    dest: /etc/systemd/system/siahsd.service
-    owner: root
-    group: root
-    mode: "0644"
-  notify: Restart siahsd
-
 - name: Start siahsd
   ansible.builtin.systemd:
     name: siahsd
     state: started
     enabled: true
     daemon_reload: true
-

roles/services/templates/discord-bot.service

@@ -1,4 +1,4 @@
-# Managed by Ansible
+# {{ ansible_managed }}
 
 [Unit]
 Description=HobbyBot
@@ -13,6 +13,7 @@ DynamicUser=true
 Environment="MQTT_HOST={{ mqtt_internal_host }}"
 Environment="DISCORD_WEBHOOK_URL={{ lookup('passwordstore', 'services/discord', subkey='webhook_url') }}"
 Environment="DISCORD_TOKEN={{ lookup('passwordstore', 'services/discord', subkey='token') }}"
+Environment="BOTTLECLIP_RESOURCES=/var/lib/bottle-clip"
 
 [Install]
 WantedBy=multi-user.target

roles/services/templates/siahsd.conf

@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 [siahsd]
 pid file = /var/lib/siahsd/siahsd.pid
 log file = /var/log/siahsd/siahsd.log
@@ -5,13 +7,6 @@ log level = 3
 foreground = 0
 event handlers = script
 
-#[database]
-#driver = mysql
-#host = localhost
-#name = siahsd
-#username = siahsd
-#password = MysbJxAaawmwKPqD
-
 [siahs]
 port = 4000
 
@@ -19,21 +14,5 @@ port = 4000
 port = 9000
 rsa key file = something.sexp
 
-#[jsonbot]
-#address = 192.168.88.15
-#port = 5500
-#aes key = blablablablablaz
-#password = mekker
-#privmsg to = #bitlair
-
-#[spacestate]
-#driver = mysql
-#host = localhost
-#name = bitwifi
-#username = bitwifi
-#password = aGWERQpLEQPUaXJV
-#open script = /opt/alarm/disarmed.sh
-#close script = /opt/alarm/armed.sh
-
 [script]
 path = /opt/alarm/siahsd_handler.sh

roles/services/templates/siahsd.service

@@ -1,17 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=Siahsd
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/lib/siahsd/siahsd.pid
-Restart=always
-RestartSec=10s
-ExecStartPre=-/bin/rm /var/lib/siahsd/siahsd.pid
-ExecStart=/usr/local/src/siahsd/build/siahsd
-User=siahsd
-
-[Install]
-WantedBy=multi-user.target

services.yaml

@@ -3,4 +3,5 @@
 - hosts: services
   roles:
     - { role: "common", tags: [ "common" ] }
+    - { role: "deb_forgejo", tags: [ "deb_forgejo" ] }
     - { role: "services", tags: [ "services" ] }