diff --git a/roles/categories.yml b/roles/categories.yml index feefd371..2e40fc44 100644 --- a/roles/categories.yml +++ b/roles/categories.yml @@ -95,6 +95,10 @@ roles: description: "Deployable web applications (GitLab, Nextcloud, Mastodon, etc.)" icon: "fas fa-docker" invokable: true + opt: + title: "Webserver Optimation" + description: "Tools which help to optimize webservers" + invokable: true net: title: "Network" description: "Network setup (DNS, Let's Encrypt HTTP, WireGuard, etc.)" diff --git a/roles/web-svc-redir-domains/README.md b/roles/web-opt-rdr-domains/README.md similarity index 100% rename from roles/web-svc-redir-domains/README.md rename to roles/web-opt-rdr-domains/README.md diff --git a/roles/web-svc-redir-domains/meta/main.yml b/roles/web-opt-rdr-domains/meta/main.yml similarity index 94% rename from roles/web-svc-redir-domains/meta/main.yml rename to roles/web-opt-rdr-domains/meta/main.yml index 93d35be8..919eac04 100644 --- a/roles/web-svc-redir-domains/meta/main.yml +++ b/roles/web-opt-rdr-domains/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: - domains repository: "https://github.com/kevinveenbirkenbach/cymais" issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" - documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/web-svc-redir-domains" + documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/web-opt-rdr-domains" min_ansible_version: "2.9" platforms: - name: Any diff --git a/roles/web-svc-redir-domains/tasks/main.yml b/roles/web-opt-rdr-domains/tasks/main.yml similarity index 100% rename from roles/web-svc-redir-domains/tasks/main.yml rename to roles/web-opt-rdr-domains/tasks/main.yml diff --git a/roles/web-svc-redir-domains/tasks/redirect-domain.yml b/roles/web-opt-rdr-domains/tasks/redirect-domain.yml similarity index 100% rename from roles/web-svc-redir-domains/tasks/redirect-domain.yml rename to roles/web-opt-rdr-domains/tasks/redirect-domain.yml diff --git a/roles/web-svc-redir-domains/templates/redirect.domain.nginx.conf.j2 b/roles/web-opt-rdr-domains/templates/redirect.domain.nginx.conf.j2 similarity index 100% rename from roles/web-svc-redir-domains/templates/redirect.domain.nginx.conf.j2 rename to roles/web-opt-rdr-domains/templates/redirect.domain.nginx.conf.j2 diff --git a/roles/web-svc-redir-domains/vars/main.yml b/roles/web-opt-rdr-domains/vars/main.yml similarity index 100% rename from roles/web-svc-redir-domains/vars/main.yml rename to roles/web-opt-rdr-domains/vars/main.yml diff --git a/roles/web-svc-redir-www/README.md b/roles/web-opt-rdr-www/README.md similarity index 95% rename from roles/web-svc-redir-www/README.md rename to roles/web-opt-rdr-www/README.md index ccf3e482..f782f4df 100644 --- a/roles/web-svc-redir-www/README.md +++ b/roles/web-opt-rdr-www/README.md @@ -7,7 +7,7 @@ Automates the creation of Nginx server blocks that redirect all `www.` subdomain This role will: - **Discover** existing `*.conf` vhosts in your Nginx servers directory - **Filter** domains with or without your `primary_domain` -- **Generate** redirect rules via the `web-svc-redir-domains` role +- **Generate** redirect rules via the `web-opt-rdr-domains` role - **Optionally** include a wildcard redirect template (experimental) ⭐️ - **Clean up** leftover configs when running in cleanup mode 🧹 diff --git a/roles/web-svc-redir-www/meta/main.yml b/roles/web-opt-rdr-www/meta/main.yml similarity index 100% rename from roles/web-svc-redir-www/meta/main.yml rename to roles/web-opt-rdr-www/meta/main.yml diff --git a/roles/web-svc-redir-www/tasks/main.yml b/roles/web-opt-rdr-www/tasks/main.yml similarity index 87% rename from roles/web-svc-redir-www/tasks/main.yml rename to roles/web-opt-rdr-www/tasks/main.yml index b8bb9100..cc19517a 100644 --- a/roles/web-svc-redir-www/tasks/main.yml +++ b/roles/web-opt-rdr-www/tasks/main.yml @@ -3,9 +3,9 @@ set_fact: www_domains: "{{ current_play_domains_all | select('match', '^www\\.') | list }}" -- name: Include web-svc-redir-domains role for www-to-bare redirects +- name: Include web-opt-rdr-domains role for www-to-bare redirects include_role: - name: web-svc-redir-domains + name: web-opt-rdr-domains vars: domain_mappings: "{{ www_domains | map('regex_replace', diff --git a/roles/web-svc-redir-www/vars/main.yml b/roles/web-opt-rdr-www/vars/main.yml similarity index 100% rename from roles/web-svc-redir-www/vars/main.yml rename to roles/web-opt-rdr-www/vars/main.yml diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml index 677f96dd..7f3d4d89 100644 --- a/tasks/stages/01_constructor.yml +++ b/tasks/stages/01_constructor.yml @@ -104,9 +104,9 @@ - name: "Load base roles" include_tasks: "./tasks/groups/{{ item }}-roles.yml" loop: - - drv - - gen - - net - - svc-db + - drv # 1. Load driver roles + - gen # 2. Load generic roles + - net # 3. Load network roles + - svc-db # 4. Load database roles loop_control: label: "{{ item }}-roles.yml" \ No newline at end of file diff --git a/tasks/stages/02_desktop.yml b/tasks/stages/02_desktop.yml index 4df7e48f..ea9d0fce 100644 --- a/tasks/stages/02_desktop.yml +++ b/tasks/stages/02_desktop.yml @@ -2,8 +2,8 @@ - name: "setup docker role includes for desktop pc" include_tasks: "./tasks/groups/{{ item }}-roles.yml" loop: - - desk - - util-desk + - desk # 1. Load generic desktop roles + - util-desk # 2. Load utility desktop roles loop_control: label: "{{ item }}-roles.yml" diff --git a/tasks/stages/02_server.yml b/tasks/stages/02_server.yml index 764d83a2..fb3b4f8b 100644 --- a/tasks/stages/02_server.yml +++ b/tasks/stages/02_server.yml @@ -13,9 +13,9 @@ - name: "Include server roles" include_tasks: "./tasks/groups/{{ item }}-roles.yml" loop: - - svc-db - - util-srv - - web-svc # Services need to run before applications - - web-app + - web-svc # 1. Load web server services + - web-app # 2. Load (UI) web applications + - util-srv # 3. Load web server collection roles + - web-opt # 4. Load optimation scrips last loop_control: label: "{{ item }}-roles.yml" diff --git a/tasks/stages/03_destructor.yml b/tasks/stages/03_destructor.yml index 4829b697..c1c65c41 100644 --- a/tasks/stages/03_destructor.yml +++ b/tasks/stages/03_destructor.yml @@ -1,6 +1,6 @@ - name: "Load destruction roles" include_tasks: "./tasks/groups/{{ item }}-roles.yml" loop: - - svc-opt # Optimation services + - svc-opt # Load optimation services loop_control: label: "{{ item }}-roles.yml" \ No newline at end of file