From 0001bade2b6568fd8ead715c33fb291719efa6b1 Mon Sep 17 00:00:00 2001 From: AnsibleGuy Date: Sat, 13 May 2023 19:30:35 +0200 Subject: [PATCH] removed 'Debian' from task names --- tasks/debian/db.yml | 10 +++++----- tasks/debian/main.yml | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tasks/debian/db.yml b/tasks/debian/db.yml index 1cb59e5..0f72baf 100644 --- a/tasks/debian/db.yml +++ b/tasks/debian/db.yml @@ -1,6 +1,6 @@ --- -- name: ZoneMinder | Debian | DB | Setting up MariaDB instance +- name: ZoneMinder | DB | Setting up MariaDB instance ansible.builtin.include_role: name: ansibleguy.infra_mariadb vars: @@ -8,7 +8,7 @@ instances: zoneminder: "{{ ZM_MARIADB_INSTANCE }}" -- name: ZoneMinder | Debian | DB | Checking if database is empty +- name: ZoneMinder | DB | Checking if database is empty community.mysql.mysql_query: login_db: "{{ ZM_CONFIG.database.name }}" query: "SELECT count(*) FROM information_schema.TABLES WHERE (TABLE_SCHEMA = '{{ ZM_CONFIG.database.name }}')" @@ -19,7 +19,7 @@ register: zm_db_empty check_mode: false -- name: ZoneMinder | Debian | DB | Connection failed! +- name: ZoneMinder | DB | Connection failed! ansible.builtin.fail: msg: "The role was unable to connect to the database! Try setting a 'static' password in your configuration. (zoneminder.database.pwd)" @@ -27,7 +27,7 @@ - zm_db_empty.failed is defined - zm_db_empty.failed -- name: ZoneMinder | Debian | DB | Importing database schema +- name: ZoneMinder | DB | Importing database schema community.mysql.mysql_db: name: "{{ ZM_CONFIG.database.name }}" state: import @@ -40,7 +40,7 @@ login_password: "{{ zm_db_pwd.stdout | default(ZM_CONFIG.database.pwd) }}" when: zm_db_empty['query_result'][0][0]['count(*)'] | int == 0 -- name: ZoneMinder | Debian | DB | Running db-update script +- name: ZoneMinder | DB | Running db-update script ansible.builtin.command: "{{ ZM_CONFIG.path.bin }}/zmupdate.pl" changed_when: false when: zm_db_empty['query_result'][0][0]['count(*)'] | int == 0 diff --git a/tasks/debian/main.yml b/tasks/debian/main.yml index 5287b27..3a7efcc 100644 --- a/tasks/debian/main.yml +++ b/tasks/debian/main.yml @@ -1,22 +1,22 @@ --- -- name: ZoneMinder | Debian | Installing dependencies +- name: ZoneMinder | Installing dependencies ansible.builtin.apt: name: "{{ ZM_HC.packages.dependencies }}" state: present -- name: ZoneMinder | Debian | Installing admin-tools +- name: ZoneMinder | Installing admin-tools ansible.builtin.apt: name: "{{ ZM_HC.packages.tools }}" state: present when: ZM_CONFIG.tools -- name: ZoneMinder | Debian | Adding repo-key +- name: ZoneMinder | Adding repo-key ansible.builtin.apt_key: url: "{{ ZM_HC.repo_key }}" when: ZM_CONFIG.add_repo -- name: ZoneMinder | Debian | Adding package repository +- name: ZoneMinder | Adding package repository ansible.builtin.apt_repository: repo: "{{ ZM_HC.repo }}" state: present @@ -24,12 +24,12 @@ filename: 'zoneminder' when: ZM_CONFIG.add_repo -- name: ZoneMinder | Debian | Installing ZoneMinder +- name: ZoneMinder | Installing ZoneMinder ansible.builtin.apt: name: "{{ ZM_HC.packages.base }}" state: present -- name: ZoneMinder | Debian | Adding zoneminder config +- name: ZoneMinder | Adding zoneminder config ansible.builtin.template: src: 'templates/etc/zm/conf.d/custom.conf.j2' dest: '/etc/zm/conf.d/custom.conf' @@ -40,12 +40,12 @@ tags: [config] register: zm_cnf -- name: ZoneMinder | Debian | Checking for database config +- name: ZoneMinder | Checking for database config ansible.builtin.stat: path: '/etc/zm/conf.d/custom_db.conf' register: zm_db_cnf_file -- name: ZoneMinder | Debian | Adding zoneminder database config +- name: ZoneMinder | Adding zoneminder database config ansible.builtin.template: src: 'templates/etc/zm/conf.d/custom_db.conf.j2' dest: '/etc/zm/conf.d/custom_db.conf' @@ -60,7 +60,7 @@ (force_pwd_change is defined and force_pwd_change) or not zm_db_cnf_file.stat.exists -- name: ZoneMinder | Debian | Pulling existing database password +- name: ZoneMinder | Pulling existing database password ansible.builtin.shell: | set -o pipefail cat /etc/zm/conf.d/custom_db.conf | grep 'ZM_DB_PASS' | cut -d '=' -f2- @@ -69,7 +69,7 @@ check_mode: false changed_when: false -- name: ZoneMinder | Debian | Updating config-privileges +- name: ZoneMinder | Updating config-privileges ansible.builtin.file: path: '/etc/zm/zm.conf' state: file @@ -78,11 +78,11 @@ mode: 0640 tags: [config] -- name: ZoneMinder | Debian | Managing database +- name: ZoneMinder | Managing database ansible.builtin.import_tasks: db.yml when: ZM_CONFIG.manage.db | bool -- name: ZoneMinder | Debian | Unmanaged DB +- name: ZoneMinder | Unmanaged DB ansible.builtin.pause: prompt: "Since this role is not managing the zoneminder-database, you will need to import the database schema initially! This can be done like this when using a local database: 'cat {{ ZM_HC.database.schema_file }} @@ -90,25 +90,25 @@ Make sure the schema is imported before continuing!" when: not ZM_CONFIG.manage.db | bool -- name: ZoneMinder | Debian | Managing webserver +- name: ZoneMinder | Managing webserver ansible.builtin.import_tasks: web.yml when: ZM_CONFIG.manage.webserver | bool tags: [config] -- name: ZoneMinder | Debian | Unmanaged webserver +- name: ZoneMinder | Unmanaged webserver ansible.builtin.pause: prompt: "Since this role is not managing the zoneminder-webserver, you will need to add its custom config as shown here: https://github.com/ZoneMinder/zoneminder/tree/master/misc" when: not ZM_CONFIG.manage.webserver | bool -- name: ZoneMinder | Debian | Enabling/Starting service +- name: ZoneMinder | Enabling/Starting service ansible.builtin.systemd: daemon_reload: yes name: 'zoneminder.service' enabled: yes state: started -- name: ZoneMinder | Debian | Restarting service +- name: ZoneMinder | Restarting service ansible.builtin.systemd: name: 'zoneminder.service' state: restarted