From 15f84e1b1fc564cb5840635a2407e360c92e6a06 Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Sat, 25 Jun 2022 14:48:38 +0200 Subject: [PATCH] Fix lint nagging --- .config/ansible-lint.yml | 1 + roles/2px-mariadb/meta/main.yml | 2 -- roles/2px/meta/main.yml | 5 +++-- roles/{2px-apache2 => 2px_apache2}/meta/main.yml | 3 ++- roles/{2px-apache2 => 2px_apache2}/tasks/main.yml | 3 ++- .../templates/2px.info.conf.j2 | 0 roles/{2px-apache2 => 2px_apache2}/vars/main.yml | 0 roles/2px_mariadb/meta/main.yml | 3 +++ roles/{2px-mariadb => 2px_mariadb}/tasks/main.yml | 3 ++- roles/{2px-mariadb => 2px_mariadb}/vars/main.yml | 0 roles/{2px-mariadb => 2px_mariadb}/vars/vault.yml | 0 roles/certbot/meta/main.yml | 3 ++- roles/certbot/tasks/main.yml | 10 ++++++---- roles/gitea-fail2ban/meta/main.yml | 2 -- roles/gitea-mariadb/meta/main.yml | 2 -- roles/gitea/handlers/main.yml | 1 + roles/gitea/meta/main.yml | 7 ++++--- roles/gitea/tasks/main.yml | 3 ++- roles/{gitea-apache2 => gitea_apache2}/meta/main.yml | 3 ++- roles/{gitea-apache2 => gitea_apache2}/tasks/main.yml | 2 ++ .../templates/git.tunuifranken.info.conf.j2 | 0 roles/{gitea-apache2 => gitea_apache2}/vars/main.yml | 0 .../files/gitea-filter.conf | 0 .../files/gitea-jail.conf | 0 roles/gitea_fail2ban/meta/main.yml | 3 +++ .../{gitea-fail2ban => gitea_fail2ban}/tasks/main.yml | 0 roles/gitea_mariadb/meta/main.yml | 3 +++ roles/{gitea-mariadb => gitea_mariadb}/tasks/main.yml | 3 ++- roles/{gitea-mariadb => gitea_mariadb}/vars/main.yml | 0 roles/{gitea-mariadb => gitea_mariadb}/vars/vault.yml | 0 roles/setup-nftables/meta/main.yml | 2 -- roles/{setup-apache2 => setup_apache2}/tasks/main.yml | 3 ++- .../files/00-banactions-nft.conf | 0 .../{setup-fail2ban => setup_fail2ban}/tasks/main.yml | 2 +- roles/{setup-mariadb => setup_mariadb}/tasks/main.yml | 2 +- .../files/input.d/ssh.conf | 0 .../files/netfilter.logrotate | 0 .../files/netfilter.rsyslog | 0 .../files/nftables.conf | 0 .../files/output.d/dhclient.conf | 0 .../files/post-hooks.d/fail2ban | 0 .../files/systemd-local.conf | 0 roles/setup_nftables/meta/main.yml | 3 +++ .../{setup-nftables => setup_nftables}/tasks/main.yml | 4 ++-- roles/tunuifranken/meta/main.yml | 3 ++- roles/tunuifranken/tasks/main.yml | 4 ++-- .../meta/main.yml | 3 ++- .../tasks/main.yml | 1 + .../templates/tunuifranken.info.conf.j2 | 0 .../vars/main.yml | 0 50 files changed, 56 insertions(+), 33 deletions(-) delete mode 100644 roles/2px-mariadb/meta/main.yml rename roles/{2px-apache2 => 2px_apache2}/meta/main.yml (53%) rename roles/{2px-apache2 => 2px_apache2}/tasks/main.yml (95%) rename roles/{2px-apache2 => 2px_apache2}/templates/2px.info.conf.j2 (100%) rename roles/{2px-apache2 => 2px_apache2}/vars/main.yml (100%) create mode 100644 roles/2px_mariadb/meta/main.yml rename roles/{2px-mariadb => 2px_mariadb}/tasks/main.yml (91%) rename roles/{2px-mariadb => 2px_mariadb}/vars/main.yml (100%) rename roles/{2px-mariadb => 2px_mariadb}/vars/vault.yml (100%) delete mode 100644 roles/gitea-fail2ban/meta/main.yml delete mode 100644 roles/gitea-mariadb/meta/main.yml rename roles/{gitea-apache2 => gitea_apache2}/meta/main.yml (53%) rename roles/{gitea-apache2 => gitea_apache2}/tasks/main.yml (96%) rename roles/{gitea-apache2 => gitea_apache2}/templates/git.tunuifranken.info.conf.j2 (100%) rename roles/{gitea-apache2 => gitea_apache2}/vars/main.yml (100%) rename roles/{gitea-fail2ban => gitea_fail2ban}/files/gitea-filter.conf (100%) rename roles/{gitea-fail2ban => gitea_fail2ban}/files/gitea-jail.conf (100%) create mode 100644 roles/gitea_fail2ban/meta/main.yml rename roles/{gitea-fail2ban => gitea_fail2ban}/tasks/main.yml (100%) create mode 100644 roles/gitea_mariadb/meta/main.yml rename roles/{gitea-mariadb => gitea_mariadb}/tasks/main.yml (92%) rename roles/{gitea-mariadb => gitea_mariadb}/vars/main.yml (100%) rename roles/{gitea-mariadb => gitea_mariadb}/vars/vault.yml (100%) delete mode 100644 roles/setup-nftables/meta/main.yml rename roles/{setup-apache2 => setup_apache2}/tasks/main.yml (95%) rename roles/{setup-fail2ban => setup_fail2ban}/files/00-banactions-nft.conf (100%) rename roles/{setup-fail2ban => setup_fail2ban}/tasks/main.yml (93%) rename roles/{setup-mariadb => setup_mariadb}/tasks/main.yml (98%) rename roles/{setup-nftables => setup_nftables}/files/input.d/ssh.conf (100%) rename roles/{setup-nftables => setup_nftables}/files/netfilter.logrotate (100%) rename roles/{setup-nftables => setup_nftables}/files/netfilter.rsyslog (100%) rename roles/{setup-nftables => setup_nftables}/files/nftables.conf (100%) rename roles/{setup-nftables => setup_nftables}/files/output.d/dhclient.conf (100%) rename roles/{setup-nftables => setup_nftables}/files/post-hooks.d/fail2ban (100%) rename roles/{setup-nftables => setup_nftables}/files/systemd-local.conf (100%) create mode 100644 roles/setup_nftables/meta/main.yml rename roles/{setup-nftables => setup_nftables}/tasks/main.yml (98%) rename roles/{tunuifranken-apache2 => tunuifranken_apache2}/meta/main.yml (53%) rename roles/{tunuifranken-apache2 => tunuifranken_apache2}/tasks/main.yml (97%) rename roles/{tunuifranken-apache2 => tunuifranken_apache2}/templates/tunuifranken.info.conf.j2 (100%) rename roles/{tunuifranken-apache2 => tunuifranken_apache2}/vars/main.yml (100%) diff --git a/.config/ansible-lint.yml b/.config/ansible-lint.yml index 3c23ce2..f8fea42 100644 --- a/.config/ansible-lint.yml +++ b/.config/ansible-lint.yml @@ -1,5 +1,6 @@ --- skip_list: - fqcn-builtins + - meta-no-info # vim: ft=yaml.ansible diff --git a/roles/2px-mariadb/meta/main.yml b/roles/2px-mariadb/meta/main.yml deleted file mode 100644 index b1b6bef..0000000 --- a/roles/2px-mariadb/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: setup-mariadb diff --git a/roles/2px/meta/main.yml b/roles/2px/meta/main.yml index a6f1066..8cab476 100644 --- a/roles/2px/meta/main.yml +++ b/roles/2px/meta/main.yml @@ -1,3 +1,4 @@ +--- dependencies: - - role: 2px-apache2 - - role: 2px-mariadb + - role: 2px_apache2 + - role: 2px_mariadb diff --git a/roles/2px-apache2/meta/main.yml b/roles/2px_apache2/meta/main.yml similarity index 53% rename from roles/2px-apache2/meta/main.yml rename to roles/2px_apache2/meta/main.yml index f767322..8f48d74 100644 --- a/roles/2px-apache2/meta/main.yml +++ b/roles/2px_apache2/meta/main.yml @@ -1,3 +1,4 @@ +--- dependencies: - - role: setup-apache2 + - role: setup_apache2 - role: certbot diff --git a/roles/2px-apache2/tasks/main.yml b/roles/2px_apache2/tasks/main.yml similarity index 95% rename from roles/2px-apache2/tasks/main.yml rename to roles/2px_apache2/tasks/main.yml index 80d5373..33966d7 100644 --- a/roles/2px-apache2/tasks/main.yml +++ b/roles/2px_apache2/tasks/main.yml @@ -13,7 +13,7 @@ apt: name: libapache2-mod-wsgi-py3 state: present - update_cache: yes + update_cache: true notify: Reload apache2 service - name: Enable wsgi module @@ -28,6 +28,7 @@ template: src: 2px.info.conf.j2 dest: /etc/apache2/sites-available/2px.info.conf + mode: 0644 notify: Reload apache2 service - name: Activate vHost diff --git a/roles/2px-apache2/templates/2px.info.conf.j2 b/roles/2px_apache2/templates/2px.info.conf.j2 similarity index 100% rename from roles/2px-apache2/templates/2px.info.conf.j2 rename to roles/2px_apache2/templates/2px.info.conf.j2 diff --git a/roles/2px-apache2/vars/main.yml b/roles/2px_apache2/vars/main.yml similarity index 100% rename from roles/2px-apache2/vars/main.yml rename to roles/2px_apache2/vars/main.yml diff --git a/roles/2px_mariadb/meta/main.yml b/roles/2px_mariadb/meta/main.yml new file mode 100644 index 0000000..0c7fbf4 --- /dev/null +++ b/roles/2px_mariadb/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: setup_mariadb diff --git a/roles/2px-mariadb/tasks/main.yml b/roles/2px_mariadb/tasks/main.yml similarity index 91% rename from roles/2px-mariadb/tasks/main.yml rename to roles/2px_mariadb/tasks/main.yml index 5867d12..aaad1d5 100644 --- a/roles/2px-mariadb/tasks/main.yml +++ b/roles/2px_mariadb/tasks/main.yml @@ -1,5 +1,6 @@ --- -- include_vars: vault.yml +- name: Include vault variables + include_vars: vault.yml - name: Create 2px database become: true diff --git a/roles/2px-mariadb/vars/main.yml b/roles/2px_mariadb/vars/main.yml similarity index 100% rename from roles/2px-mariadb/vars/main.yml rename to roles/2px_mariadb/vars/main.yml diff --git a/roles/2px-mariadb/vars/vault.yml b/roles/2px_mariadb/vars/vault.yml similarity index 100% rename from roles/2px-mariadb/vars/vault.yml rename to roles/2px_mariadb/vars/vault.yml diff --git a/roles/certbot/meta/main.yml b/roles/certbot/meta/main.yml index 50ded35..30b8cd3 100644 --- a/roles/certbot/meta/main.yml +++ b/roles/certbot/meta/main.yml @@ -1,2 +1,3 @@ +--- dependencies: - - role: setup-nftables + - role: setup_nftables diff --git a/roles/certbot/tasks/main.yml b/roles/certbot/tasks/main.yml index f6e70fa..07c9509 100644 --- a/roles/certbot/tasks/main.yml +++ b/roles/certbot/tasks/main.yml @@ -4,7 +4,7 @@ apt: name: certbot state: present - update_cache: yes + update_cache: true - name: Create acme directory become: true @@ -25,10 +25,10 @@ - name: Copy apache confs become: true - copy: src={{ item.src }} dest={{ item.dest }} + copy: src={{ item.src }} dest={{ item.dest }} mode=0644 with_items: - - { src: 'acme.conf', dest: '/etc/apache2/conf-available/acme.conf' } - - { src: 'ssl-options.conf', dest: '/etc/apache2/conf-available/ssl-options.conf' } + - {src: 'acme.conf', dest: '/etc/apache2/conf-available/acme.conf'} + - {src: 'ssl-options.conf', dest: '/etc/apache2/conf-available/ssl-options.conf'} - name: Enable apache confs @@ -46,6 +46,7 @@ copy: src: http-certbot.conf dest: /etc/nftables/input.d/http-certbot.conf + mode: 0640 notify: Reload nftables service - name: Allow incoming HTTPS @@ -53,4 +54,5 @@ copy: src: https.conf dest: /etc/nftables/input.d/https.conf + mode: 0640 notify: Reload nftables service diff --git a/roles/gitea-fail2ban/meta/main.yml b/roles/gitea-fail2ban/meta/main.yml deleted file mode 100644 index 4a59999..0000000 --- a/roles/gitea-fail2ban/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: setup-fail2ban diff --git a/roles/gitea-mariadb/meta/main.yml b/roles/gitea-mariadb/meta/main.yml deleted file mode 100644 index b1b6bef..0000000 --- a/roles/gitea-mariadb/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: setup-mariadb diff --git a/roles/gitea/handlers/main.yml b/roles/gitea/handlers/main.yml index 2490ba5..e7c4ec4 100644 --- a/roles/gitea/handlers/main.yml +++ b/roles/gitea/handlers/main.yml @@ -8,6 +8,7 @@ get_url: url: "https://dl.gitea.io/gitea/{{ gitea_binary.json.latest.version }}/gitea-{{ gitea_binary.json.latest.version }}-linux-{{ gitea_binary_arch }}.asc" dest: "/tmp/gitea-{{ gitea_binary.json.latest.version }}.asc" + mode: 0644 - name: Verify gitea binary with gpg command: "gpg --verify /tmp/gitea-{{ gitea_binary.json.latest.version }}.asc /home/git/gitea-{{ gitea_binary.json.latest.version }}" diff --git a/roles/gitea/meta/main.yml b/roles/gitea/meta/main.yml index 9521118..310a424 100644 --- a/roles/gitea/meta/main.yml +++ b/roles/gitea/meta/main.yml @@ -1,4 +1,5 @@ +--- dependencies: - - role: gitea-fail2ban - - role: gitea-mariadb - - role: gitea-apache2 + - role: gitea_fail2ban + - role: gitea_mariadb + - role: gitea_apache2 diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml index e6104f4..41bcc8d 100644 --- a/roles/gitea/tasks/main.yml +++ b/roles/gitea/tasks/main.yml @@ -1,5 +1,6 @@ --- -- include_vars: vault.yml +- name: Include vault variables + include_vars: vault.yml - name: Install needed packages become: true diff --git a/roles/gitea-apache2/meta/main.yml b/roles/gitea_apache2/meta/main.yml similarity index 53% rename from roles/gitea-apache2/meta/main.yml rename to roles/gitea_apache2/meta/main.yml index f767322..8f48d74 100644 --- a/roles/gitea-apache2/meta/main.yml +++ b/roles/gitea_apache2/meta/main.yml @@ -1,3 +1,4 @@ +--- dependencies: - - role: setup-apache2 + - role: setup_apache2 - role: certbot diff --git a/roles/gitea-apache2/tasks/main.yml b/roles/gitea_apache2/tasks/main.yml similarity index 96% rename from roles/gitea-apache2/tasks/main.yml rename to roles/gitea_apache2/tasks/main.yml index 1bc684d..058d8df 100644 --- a/roles/gitea-apache2/tasks/main.yml +++ b/roles/gitea_apache2/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Enable proxy modules become: true apache2_module: @@ -13,6 +14,7 @@ template: src: git.tunuifranken.info.conf.j2 dest: /etc/apache2/sites-available/git.tunuifranken.info.conf + mode: 0644 notify: Reload apache2 service - name: Activate vHost diff --git a/roles/gitea-apache2/templates/git.tunuifranken.info.conf.j2 b/roles/gitea_apache2/templates/git.tunuifranken.info.conf.j2 similarity index 100% rename from roles/gitea-apache2/templates/git.tunuifranken.info.conf.j2 rename to roles/gitea_apache2/templates/git.tunuifranken.info.conf.j2 diff --git a/roles/gitea-apache2/vars/main.yml b/roles/gitea_apache2/vars/main.yml similarity index 100% rename from roles/gitea-apache2/vars/main.yml rename to roles/gitea_apache2/vars/main.yml diff --git a/roles/gitea-fail2ban/files/gitea-filter.conf b/roles/gitea_fail2ban/files/gitea-filter.conf similarity index 100% rename from roles/gitea-fail2ban/files/gitea-filter.conf rename to roles/gitea_fail2ban/files/gitea-filter.conf diff --git a/roles/gitea-fail2ban/files/gitea-jail.conf b/roles/gitea_fail2ban/files/gitea-jail.conf similarity index 100% rename from roles/gitea-fail2ban/files/gitea-jail.conf rename to roles/gitea_fail2ban/files/gitea-jail.conf diff --git a/roles/gitea_fail2ban/meta/main.yml b/roles/gitea_fail2ban/meta/main.yml new file mode 100644 index 0000000..1644eeb --- /dev/null +++ b/roles/gitea_fail2ban/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: setup_fail2ban diff --git a/roles/gitea-fail2ban/tasks/main.yml b/roles/gitea_fail2ban/tasks/main.yml similarity index 100% rename from roles/gitea-fail2ban/tasks/main.yml rename to roles/gitea_fail2ban/tasks/main.yml diff --git a/roles/gitea_mariadb/meta/main.yml b/roles/gitea_mariadb/meta/main.yml new file mode 100644 index 0000000..0c7fbf4 --- /dev/null +++ b/roles/gitea_mariadb/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: setup_mariadb diff --git a/roles/gitea-mariadb/tasks/main.yml b/roles/gitea_mariadb/tasks/main.yml similarity index 92% rename from roles/gitea-mariadb/tasks/main.yml rename to roles/gitea_mariadb/tasks/main.yml index 8559d38..6598905 100644 --- a/roles/gitea-mariadb/tasks/main.yml +++ b/roles/gitea_mariadb/tasks/main.yml @@ -1,5 +1,6 @@ --- -- include_vars: vault.yml +- name: Include vault variables + include_vars: vault.yml - name: Create gitea database become: true diff --git a/roles/gitea-mariadb/vars/main.yml b/roles/gitea_mariadb/vars/main.yml similarity index 100% rename from roles/gitea-mariadb/vars/main.yml rename to roles/gitea_mariadb/vars/main.yml diff --git a/roles/gitea-mariadb/vars/vault.yml b/roles/gitea_mariadb/vars/vault.yml similarity index 100% rename from roles/gitea-mariadb/vars/vault.yml rename to roles/gitea_mariadb/vars/vault.yml diff --git a/roles/setup-nftables/meta/main.yml b/roles/setup-nftables/meta/main.yml deleted file mode 100644 index 4a59999..0000000 --- a/roles/setup-nftables/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - role: setup-fail2ban diff --git a/roles/setup-apache2/tasks/main.yml b/roles/setup_apache2/tasks/main.yml similarity index 95% rename from roles/setup-apache2/tasks/main.yml rename to roles/setup_apache2/tasks/main.yml index e9fd5b2..9902bad 100644 --- a/roles/setup-apache2/tasks/main.yml +++ b/roles/setup_apache2/tasks/main.yml @@ -4,7 +4,7 @@ apt: name: apache2 state: present - update_cache: yes + update_cache: true notify: Start apache2 service - name: Remove default html dir @@ -38,3 +38,4 @@ file: path: /var/www/empty state: directory + mode: 0755 diff --git a/roles/setup-fail2ban/files/00-banactions-nft.conf b/roles/setup_fail2ban/files/00-banactions-nft.conf similarity index 100% rename from roles/setup-fail2ban/files/00-banactions-nft.conf rename to roles/setup_fail2ban/files/00-banactions-nft.conf diff --git a/roles/setup-fail2ban/tasks/main.yml b/roles/setup_fail2ban/tasks/main.yml similarity index 93% rename from roles/setup-fail2ban/tasks/main.yml rename to roles/setup_fail2ban/tasks/main.yml index 1a628f3..d991b47 100644 --- a/roles/setup-fail2ban/tasks/main.yml +++ b/roles/setup_fail2ban/tasks/main.yml @@ -4,7 +4,7 @@ apt: name: fail2ban state: present - update_cache: yes + update_cache: true - name: Configure fail2ban for nftables become: true diff --git a/roles/setup-mariadb/tasks/main.yml b/roles/setup_mariadb/tasks/main.yml similarity index 98% rename from roles/setup-mariadb/tasks/main.yml rename to roles/setup_mariadb/tasks/main.yml index d6b9da0..e05ea66 100644 --- a/roles/setup-mariadb/tasks/main.yml +++ b/roles/setup_mariadb/tasks/main.yml @@ -6,7 +6,7 @@ - mariadb-server - python3-pymysql state: present - update_cache: yes + update_cache: true notify: Start mariadb service - name: Initialize mariadb diff --git a/roles/setup-nftables/files/input.d/ssh.conf b/roles/setup_nftables/files/input.d/ssh.conf similarity index 100% rename from roles/setup-nftables/files/input.d/ssh.conf rename to roles/setup_nftables/files/input.d/ssh.conf diff --git a/roles/setup-nftables/files/netfilter.logrotate b/roles/setup_nftables/files/netfilter.logrotate similarity index 100% rename from roles/setup-nftables/files/netfilter.logrotate rename to roles/setup_nftables/files/netfilter.logrotate diff --git a/roles/setup-nftables/files/netfilter.rsyslog b/roles/setup_nftables/files/netfilter.rsyslog similarity index 100% rename from roles/setup-nftables/files/netfilter.rsyslog rename to roles/setup_nftables/files/netfilter.rsyslog diff --git a/roles/setup-nftables/files/nftables.conf b/roles/setup_nftables/files/nftables.conf similarity index 100% rename from roles/setup-nftables/files/nftables.conf rename to roles/setup_nftables/files/nftables.conf diff --git a/roles/setup-nftables/files/output.d/dhclient.conf b/roles/setup_nftables/files/output.d/dhclient.conf similarity index 100% rename from roles/setup-nftables/files/output.d/dhclient.conf rename to roles/setup_nftables/files/output.d/dhclient.conf diff --git a/roles/setup-nftables/files/post-hooks.d/fail2ban b/roles/setup_nftables/files/post-hooks.d/fail2ban similarity index 100% rename from roles/setup-nftables/files/post-hooks.d/fail2ban rename to roles/setup_nftables/files/post-hooks.d/fail2ban diff --git a/roles/setup-nftables/files/systemd-local.conf b/roles/setup_nftables/files/systemd-local.conf similarity index 100% rename from roles/setup-nftables/files/systemd-local.conf rename to roles/setup_nftables/files/systemd-local.conf diff --git a/roles/setup_nftables/meta/main.yml b/roles/setup_nftables/meta/main.yml new file mode 100644 index 0000000..1644eeb --- /dev/null +++ b/roles/setup_nftables/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: setup_fail2ban diff --git a/roles/setup-nftables/tasks/main.yml b/roles/setup_nftables/tasks/main.yml similarity index 98% rename from roles/setup-nftables/tasks/main.yml rename to roles/setup_nftables/tasks/main.yml index 15aa87f..3a61524 100644 --- a/roles/setup-nftables/tasks/main.yml +++ b/roles/setup_nftables/tasks/main.yml @@ -4,7 +4,7 @@ apt: name: nftables state: present - update_cache: yes + update_cache: true notify: Start nftables service - name: Start nftables @@ -79,7 +79,7 @@ group: root mode: 0640 with_fileglob: - - output.d/* + - output.d/* notify: Restart nftables service - name: Setup netfilter.log diff --git a/roles/tunuifranken/meta/main.yml b/roles/tunuifranken/meta/main.yml index c005cb0..9e4f0fd 100644 --- a/roles/tunuifranken/meta/main.yml +++ b/roles/tunuifranken/meta/main.yml @@ -1,2 +1,3 @@ +--- dependencies: - - role: tunuifranken-apache2 + - role: tunuifranken_apache2 diff --git a/roles/tunuifranken/tasks/main.yml b/roles/tunuifranken/tasks/main.yml index 9292b8d..c4eaf58 100644 --- a/roles/tunuifranken/tasks/main.yml +++ b/roles/tunuifranken/tasks/main.yml @@ -9,6 +9,6 @@ git: repo: git@tunuifranken.info:flyingscorpio/tunuifranken.info.git dest: "{{ dir_tunuifranken }}" - clone: yes + clone: true version: main - update: no + update: false diff --git a/roles/tunuifranken-apache2/meta/main.yml b/roles/tunuifranken_apache2/meta/main.yml similarity index 53% rename from roles/tunuifranken-apache2/meta/main.yml rename to roles/tunuifranken_apache2/meta/main.yml index f767322..8f48d74 100644 --- a/roles/tunuifranken-apache2/meta/main.yml +++ b/roles/tunuifranken_apache2/meta/main.yml @@ -1,3 +1,4 @@ +--- dependencies: - - role: setup-apache2 + - role: setup_apache2 - role: certbot diff --git a/roles/tunuifranken-apache2/tasks/main.yml b/roles/tunuifranken_apache2/tasks/main.yml similarity index 97% rename from roles/tunuifranken-apache2/tasks/main.yml rename to roles/tunuifranken_apache2/tasks/main.yml index 0f6102b..7d907ec 100644 --- a/roles/tunuifranken-apache2/tasks/main.yml +++ b/roles/tunuifranken_apache2/tasks/main.yml @@ -13,6 +13,7 @@ template: src: tunuifranken.info.conf.j2 dest: /etc/apache2/sites-available/tunuifranken.info.conf + mode: 0644 notify: Reload apache2 service - name: Activate vHost diff --git a/roles/tunuifranken-apache2/templates/tunuifranken.info.conf.j2 b/roles/tunuifranken_apache2/templates/tunuifranken.info.conf.j2 similarity index 100% rename from roles/tunuifranken-apache2/templates/tunuifranken.info.conf.j2 rename to roles/tunuifranken_apache2/templates/tunuifranken.info.conf.j2 diff --git a/roles/tunuifranken-apache2/vars/main.yml b/roles/tunuifranken_apache2/vars/main.yml similarity index 100% rename from roles/tunuifranken-apache2/vars/main.yml rename to roles/tunuifranken_apache2/vars/main.yml