diff --git a/roles/bank/defaults/main.yaml b/roles/bank/defaults/main.yaml index b0fea92..136726e 100644 --- a/roles/bank/defaults/main.yaml +++ b/roles/bank/defaults/main.yaml @@ -1,3 +1,3 @@ bank_user: bank -bank_revbank_git: https://git.bitlair.nl/bitlair/revbank.git +bank_revbank_git: https://github.com/revspace/revbank.git bank_local_tty: no diff --git a/roles/bank/tasks/inflatinator.service b/roles/bank/tasks/inflatinator.service deleted file mode 100644 index c4a2397..0000000 --- a/roles/bank/tasks/inflatinator.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Update product prices in Revbank - -[Service] -Type=oneshot -ExecStart=/opt/revbank-inflatinator/.venv/bin/python /opt/revbank-inflatinator/inflatinator/ /home/bank/revbank.products -EnvironmentFile=/etc/revbank-inflatinator/env.conf -User=bank -Group=bank diff --git a/roles/bank/tasks/inflatinator.yaml b/roles/bank/tasks/inflatinator.yaml index 9ae9427..dc687a3 100644 --- a/roles/bank/tasks/inflatinator.yaml +++ b/roles/bank/tasks/inflatinator.yaml @@ -1,33 +1,12 @@ --- - name: Install dependencies ansible.builtin.apt: - name: virtualenv + name: [ links, python3-pyquery ] state: present - name: Clone revbank-inflatinator source ansible.builtin.git: - repo: https://git.bitlair.nl/bitlair/revbank-inflatinator.git + repo: https://github.com/bitlair/revbank-inflatinator.git version: main dest: /opt/revbank-inflatinator accept_hostkey: yes - -- name: Create virtualenv - ansible.builtin.command: - cmd: virtualenv /opt/revbank-inflatinator/.venv - args: - creates: /opt/revbank-inflatinator/.venv - -- name: Install Python dependencies - ansible.builtin.shell: - cmd: . .venv/bin/activate && pip install -r requirements.txt - args: - chdir: /opt/revbank-inflatinator - -- name: Install service - ansible.builtin.template: - src: inflatinator.service - dest: /etc/systemd/system/revbank-inflatinator.service - owner: root - group: root - mode: 0644 - notify: Daemon reload diff --git a/roles/monitoring/tasks/mqtt_exporter.yaml b/roles/monitoring/tasks/mqtt_exporter.yaml index 0ae5d07..b41fc42 100644 --- a/roles/monitoring/tasks/mqtt_exporter.yaml +++ b/roles/monitoring/tasks/mqtt_exporter.yaml @@ -24,7 +24,7 @@ group: root mode: 0644 notify: - - Daemon reload + - daemon reload - restart mqtt_exporter - name: Install config file @@ -35,7 +35,7 @@ group: root mode: 0644 notify: - - Daemon reload + - daemon reload - restart mqtt_exporter - ansible.builtin.meta: flush_handlers