From acae0432c8f050681285ce355729ebeb895b878e Mon Sep 17 00:00:00 2001 From: Christian Schnidrig Date: Mon, 1 Mar 2021 08:59:54 +0100 Subject: [PATCH] some clean ups --- group_vars/all/defaults | 5 -- openhab.yml | 1 - replace_default_config_with_git_repo.yml | 28 ----------- roles/mqttwarn/handlers/main.yml | 5 -- roles/mqttwarn/tasks/main.yml | 8 --- roles/mqttwarn/tasks/mosquitto.yml | 12 ----- roles/mqttwarn/tasks/mqttwarn.apt.yml | 50 ------------------- roles/mqttwarn/tasks/mqttwarn.yml | 59 ----------------------- roles/mqttwarn/templates/mqttwarn.ini | 49 ------------------- roles/mqttwarn/templates/mqttwarn.service | 17 ------- 10 files changed, 234 deletions(-) delete mode 100644 replace_default_config_with_git_repo.yml delete mode 100644 roles/mqttwarn/handlers/main.yml delete mode 100644 roles/mqttwarn/tasks/main.yml delete mode 100644 roles/mqttwarn/tasks/mosquitto.yml delete mode 100644 roles/mqttwarn/tasks/mqttwarn.apt.yml delete mode 100644 roles/mqttwarn/tasks/mqttwarn.yml delete mode 100644 roles/mqttwarn/templates/mqttwarn.ini delete mode 100644 roles/mqttwarn/templates/mqttwarn.service diff --git a/group_vars/all/defaults b/group_vars/all/defaults index b516e30..d2d2b78 100644 --- a/group_vars/all/defaults +++ b/group_vars/all/defaults @@ -3,11 +3,6 @@ jdk: "zulu11.45.27-ca-jdk11.0.10-linux_aarch32hf" jdk_url: "https://cdn.azul.com/zulu-embedded/bin/{{ jdk }}.tar.gz" -openhab_version: "3.0.1" -openhab_userid: "1000" -openhab_groupid: "1000" -openhab_root_dir: "/home/pi/openhab" - timezone: "Europe/Zurich" locale: "en_US.UTF-8" diff --git a/openhab.yml b/openhab.yml index e161f60..62a9e82 100644 --- a/openhab.yml +++ b/openhab.yml @@ -5,7 +5,6 @@ gather_facts: no roles: - raspberry - #- mqttwarn - openhab diff --git a/replace_default_config_with_git_repo.yml b/replace_default_config_with_git_repo.yml deleted file mode 100644 index 3c76a16..0000000 --- a/replace_default_config_with_git_repo.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- hosts: controller - become: true - tasks: - - name: stop openhab - service: name=openhab state=stopped - - name: delete default config - file: - path: "/etc/openhab" - state: absent - - name: create config dir - file: - path: "/etc/openhab" - owner: pi - group: pi - state: directory - - name: clone config repo - git: - repo: "{{vault_openhab_config_repo}}" - dest: "/etc/openhab" - accept_hostkey: true - update: no - clone: yes - become: false - - name: start openhab - service: name=openhab state=started - diff --git a/roles/mqttwarn/handlers/main.yml b/roles/mqttwarn/handlers/main.yml deleted file mode 100644 index e0c8363..0000000 --- a/roles/mqttwarn/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- name: restart mqttwarn - service: name=mqttwarn state=restarted - diff --git a/roles/mqttwarn/tasks/main.yml b/roles/mqttwarn/tasks/main.yml deleted file mode 100644 index af4dc34..0000000 --- a/roles/mqttwarn/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -- include: mosquitto.yml - tags: - - mosquitto -- include: mqttwarn.yml - tags: - - mqttwarn diff --git a/roles/mqttwarn/tasks/mosquitto.yml b/roles/mqttwarn/tasks/mosquitto.yml deleted file mode 100644 index a34f10a..0000000 --- a/roles/mqttwarn/tasks/mosquitto.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: install mosquitto packages - apt: - pkg: - - mosquitto - - mosquitto-clients - update_cache: "{{apt_config.update_cache}}" - cache_valid_time: "{{apt_config.cache_valid_time}}" - - - diff --git a/roles/mqttwarn/tasks/mqttwarn.apt.yml b/roles/mqttwarn/tasks/mqttwarn.apt.yml deleted file mode 100644 index 45d6d39..0000000 --- a/roles/mqttwarn/tasks/mqttwarn.apt.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- - -- name: install packages - apt: - pkg: - - python3-paho-mqtt - update_cache: "{{apt_config.update_cache}}" - cache_valid_time: "{{apt_config.cache_valid_time}}" - -- name: install mqttwarn - vars: - ansible_python_interpreter: /usr/bin/python3 - pip: - name: mqttwarn - -- name: install config file - template: - src: mqttwarn.ini - dest: "/etc/mqttwarn.ini" - owner: root - group: root - mode: "u=rw,g=r,o=r" - notify: restart mqttwarn - tags: - - mqttwarnconfig - -- name: create log dir - file: - dest: "/var/log/mqttwarn" - state: directory - owner: pi - group: pi - -- name: install service file - template: - src: mqttwarn.service - dest: "/etc/systemd/system/mqttwarn.service" - owner: root - group: root - mode: "u=rw,g=r,o=r" - notify: restart mqttwarn - -- name: "configure systemd" - systemd: - name: mqttwarn - daemon_reload: yes - enabled: true - state: started - - diff --git a/roles/mqttwarn/tasks/mqttwarn.yml b/roles/mqttwarn/tasks/mqttwarn.yml deleted file mode 100644 index a055667..0000000 --- a/roles/mqttwarn/tasks/mqttwarn.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- - -- name: install packages - apt: - pkg: - - python-paho-mqtt - - python3-paho-mqtt - update_cache: "{{apt_config.update_cache}}" - cache_valid_time: "{{apt_config.cache_valid_time}}" - -- git: - repo: "https://github.com/jpmens/mqttwarn.git" - dest: "/opt/mqttwarn" - version: "0.10.4" - #version: "0c030a94a7e3590ea3485f460be555cee027d8a8" - tags: - - mqttwarn - -- name: install config file - template: - src: mqttwarn.ini - dest: "/opt/mqttwarn/mqttwarn.ini" - owner: root - group: root - mode: "u=rw,g=r,o=r" - notify: restart mqttwarn - tags: - - mqttwarn - - mqttwarnconfig - -- name: create log dir - file: - dest: "/var/log/mqttwarn" - state: directory - owner: pi - group: pi - tags: - - mqttwarn - -- name: install service file - template: - src: mqttwarn.service - dest: "/etc/systemd/system/mqttwarn.service" - owner: root - group: root - mode: "u=rw,g=r,o=r" - tags: - - mqttwarn - -- name: "configure systemd" - systemd: - name: mqttwarn - daemon_reload: yes - enabled: true - state: started - tags: - - mqttwarn - - diff --git a/roles/mqttwarn/templates/mqttwarn.ini b/roles/mqttwarn/templates/mqttwarn.ini deleted file mode 100644 index 0855ea2..0000000 --- a/roles/mqttwarn/templates/mqttwarn.ini +++ /dev/null @@ -1,49 +0,0 @@ -[defaults] -hostname = 'localhost' -port = 1883 -clientid = 'mqttwarn' - -; logging -logformat = '%(asctime)-15s %(levelname)-5s [%(module)s] %(message)s' -logfile = '/var/log/mqttwarn/mqttwarn.log' - -; one of: CRITICAL, DEBUG, ERROR, INFO, WARN -loglevel = INFO - -; name the service providers you will be using. -launch = file, log, carbon - -[config:file] -append_newline = True -targets = { - 'f01' : ['/tmp/f.01'], - 'log-me' : ['/tmp/log.me'], - 'mqttwarn' : ['/tmp/mqttwarn.err'], - } - -[config:log] -targets = { - 'debug' : [ 'debug' ], - 'info' : [ 'info' ], - 'warn' : [ 'warn' ], - 'crit' : [ 'crit' ], - 'error' : [ 'error' ] - } - - -; special config for 'failover' events -[failover] -targets = log:error, file:mqttwarn - - -[config:carbon] -targets = { - 'openhab' : [ '{{graphite_server}}',2003 ], - } - - -[/openhab/graphite/#] -targets = carbon:openhab -;targets = log:info, file:f01, carbon:openhab - -# instead of logging run `mosquitto_sub -t /openhab/graphite/#` diff --git a/roles/mqttwarn/templates/mqttwarn.service b/roles/mqttwarn/templates/mqttwarn.service deleted file mode 100644 index 8603e1c..0000000 --- a/roles/mqttwarn/templates/mqttwarn.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=MQTTwarn -After=mosquitto.service - -[Service] -Type=simple -User=pi -Group=pi -#WorkingDirectory=/home/pi -WorkingDirectory=/opt/mqttwarn -#Environment="MQTTWARNINI=/etc/mqttwarn.ini" -#ExecStart=/usr/local/bin/mqttwarn -ExecStart=/opt/mqttwarn/mqttwarn.py - -[Install] -WantedBy=default.target -