From 38ff34fb57aca9c2bbcbde998bcfa7b3860f283d Mon Sep 17 00:00:00 2001
From: David Kilias <dkdent@netz39.de>
Date: Sun, 23 Oct 2022 22:49:57 +0200
Subject: [PATCH] fix: rename role apache-letsencrypt to resolve linter
warnings
---
krypton.yml | 2 +-
pottwal.yml | 2 +-
radon.yml | 2 +-
.../defaults/main.yml | 2 +-
.../handlers/main.yml | 2 +-
roles/{apache-letsencrypt => apache_letsencrypt}/tasks/main.yml | 2 +-
.../templates/letsencrypt-directory.conf.j2 | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename roles/{apache-letsencrypt => apache_letsencrypt}/defaults/main.yml (57%)
rename roles/{apache-letsencrypt => apache_letsencrypt}/handlers/main.yml (66%)
rename roles/{apache-letsencrypt => apache_letsencrypt}/tasks/main.yml (94%)
rename roles/{apache-letsencrypt => apache_letsencrypt}/templates/letsencrypt-directory.conf.j2 (100%)
diff --git a/krypton.yml b/krypton.yml
index 0b8319f..b0b9158 100644
--- a/krypton.yml
+++ b/krypton.yml
@@ -24,7 +24,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- - role: apache-letsencrypt # Uses configuration from dehydrated setup
+ - role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
diff --git a/pottwal.yml b/pottwal.yml
index 3dc3dec..5cf44e6 100644
--- a/pottwal.yml
+++ b/pottwal.yml
@@ -34,7 +34,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- - role: apache-letsencrypt # Uses configuration from dehydrated setup
+ - role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
diff --git a/radon.yml b/radon.yml
index 26a17dd..3e1e955 100644
--- a/radon.yml
+++ b/radon.yml
@@ -26,7 +26,7 @@
vars:
docker_data_root: "/srv/docker"
- role: apache
- - role: apache-letsencrypt # Uses configuration from dehydrated setup
+ - role: apache_letsencrypt # Uses configuration from dehydrated setup
- role: ansible-role-dehydrated
vars:
dehydrated_contact_email: "{{ server_admin }}"
diff --git a/roles/apache-letsencrypt/defaults/main.yml b/roles/apache_letsencrypt/defaults/main.yml
similarity index 57%
rename from roles/apache-letsencrypt/defaults/main.yml
rename to roles/apache_letsencrypt/defaults/main.yml
index 4abe7fe..6967d14 100644
--- a/roles/apache-letsencrypt/defaults/main.yml
+++ b/roles/apache_letsencrypt/defaults/main.yml
@@ -1,3 +1,3 @@
-# Defaults for role apache-letsencrypt
+# Defaults for role apache_letsencrypt
---
dehydrated_location: "/usr/local/etc/dehydrated"
diff --git a/roles/apache-letsencrypt/handlers/main.yml b/roles/apache_letsencrypt/handlers/main.yml
similarity index 66%
rename from roles/apache-letsencrypt/handlers/main.yml
rename to roles/apache_letsencrypt/handlers/main.yml
index 04949e9..abf4ea1 100644
--- a/roles/apache-letsencrypt/handlers/main.yml
+++ b/roles/apache_letsencrypt/handlers/main.yml
@@ -1,4 +1,4 @@
-# Handlers for role apache-letsencrypt
+# Handlers for role apache_letsencrypt
---
- name: restart apache2
service:
diff --git a/roles/apache-letsencrypt/tasks/main.yml b/roles/apache_letsencrypt/tasks/main.yml
similarity index 94%
rename from roles/apache-letsencrypt/tasks/main.yml
rename to roles/apache_letsencrypt/tasks/main.yml
index b51f3a7..6acb952 100644
--- a/roles/apache-letsencrypt/tasks/main.yml
+++ b/roles/apache_letsencrypt/tasks/main.yml
@@ -1,4 +1,4 @@
-# Tasks for role apache-letsencrypt
+# Tasks for role apache_letsencrypt
---
- name: Create configuration for access to dehydrated location
ansible.builtin.template:
diff --git a/roles/apache-letsencrypt/templates/letsencrypt-directory.conf.j2 b/roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2
similarity index 100%
rename from roles/apache-letsencrypt/templates/letsencrypt-directory.conf.j2
rename to roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2