From 9ec5b6dec6d6f660f65efd87925f0b006441bdc2 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 24 Jun 2024 18:30:34 +0200 Subject: [PATCH 1/2] Switch site playbook to use forgejo --- group_vars/testing.yml | 2 +- roles/{gitea => forgejo}/README.md | 0 roles/{gitea => forgejo}/defaults/main.yml | 0 roles/{gitea => forgejo}/files/forgejo | 0 roles/{gitea => forgejo}/handlers/main.yml | 0 roles/{gitea => forgejo}/meta/main.yml | 0 roles/{gitea => forgejo}/tasks/Ubuntu.yml | 0 roles/{gitea => forgejo}/tasks/main.yml | 0 roles/{gitea => forgejo}/templates/docker-stack.yml.j2 | 0 roles/{gitea => forgejo}/templates/upstream.json.j2 | 0 roles/{gitea => forgejo}/templates/upstream_ci.json.j2 | 0 roles/{gitea => forgejo}/vars/main.yml | 0 site.yml | 6 +++--- 13 files changed, 4 insertions(+), 4 deletions(-) rename roles/{gitea => forgejo}/README.md (100%) rename roles/{gitea => forgejo}/defaults/main.yml (100%) rename roles/{gitea => forgejo}/files/forgejo (100%) rename roles/{gitea => forgejo}/handlers/main.yml (100%) rename roles/{gitea => forgejo}/meta/main.yml (100%) rename roles/{gitea => forgejo}/tasks/Ubuntu.yml (100%) rename roles/{gitea => forgejo}/tasks/main.yml (100%) rename roles/{gitea => forgejo}/templates/docker-stack.yml.j2 (100%) rename roles/{gitea => forgejo}/templates/upstream.json.j2 (100%) rename roles/{gitea => forgejo}/templates/upstream_ci.json.j2 (100%) rename roles/{gitea => forgejo}/vars/main.yml (100%) diff --git a/group_vars/testing.yml b/group_vars/testing.yml index c27a1ff..a449c70 100644 --- a/group_vars/testing.yml +++ b/group_vars/testing.yml @@ -7,7 +7,7 @@ caddy_tls_use_staging: yes blog_use_https: no caddy_use_https: no -gitea_use_https: no +forgejo_use_https: no landingpage_use_https: no miniflux_use_https: no monica_use_https: no diff --git a/roles/gitea/README.md b/roles/forgejo/README.md similarity index 100% rename from roles/gitea/README.md rename to roles/forgejo/README.md diff --git a/roles/gitea/defaults/main.yml b/roles/forgejo/defaults/main.yml similarity index 100% rename from roles/gitea/defaults/main.yml rename to roles/forgejo/defaults/main.yml diff --git a/roles/gitea/files/forgejo b/roles/forgejo/files/forgejo similarity index 100% rename from roles/gitea/files/forgejo rename to roles/forgejo/files/forgejo diff --git a/roles/gitea/handlers/main.yml b/roles/forgejo/handlers/main.yml similarity index 100% rename from roles/gitea/handlers/main.yml rename to roles/forgejo/handlers/main.yml diff --git a/roles/gitea/meta/main.yml b/roles/forgejo/meta/main.yml similarity index 100% rename from roles/gitea/meta/main.yml rename to roles/forgejo/meta/main.yml diff --git a/roles/gitea/tasks/Ubuntu.yml b/roles/forgejo/tasks/Ubuntu.yml similarity index 100% rename from roles/gitea/tasks/Ubuntu.yml rename to roles/forgejo/tasks/Ubuntu.yml diff --git a/roles/gitea/tasks/main.yml b/roles/forgejo/tasks/main.yml similarity index 100% rename from roles/gitea/tasks/main.yml rename to roles/forgejo/tasks/main.yml diff --git a/roles/gitea/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2 similarity index 100% rename from roles/gitea/templates/docker-stack.yml.j2 rename to roles/forgejo/templates/docker-stack.yml.j2 diff --git a/roles/gitea/templates/upstream.json.j2 b/roles/forgejo/templates/upstream.json.j2 similarity index 100% rename from roles/gitea/templates/upstream.json.j2 rename to roles/forgejo/templates/upstream.json.j2 diff --git a/roles/gitea/templates/upstream_ci.json.j2 b/roles/forgejo/templates/upstream_ci.json.j2 similarity index 100% rename from roles/gitea/templates/upstream_ci.json.j2 rename to roles/forgejo/templates/upstream_ci.json.j2 diff --git a/roles/gitea/vars/main.yml b/roles/forgejo/vars/main.yml similarity index 100% rename from roles/gitea/vars/main.yml rename to roles/forgejo/vars/main.yml diff --git a/site.yml b/site.yml index 4b8e657..0ed3a12 100644 --- a/site.yml +++ b/site.yml @@ -71,10 +71,10 @@ role: landingpage tags: landingpage - - name: Install gitea + - name: Install forgejo import_role: - role: gitea - tags: gitea + role: forgejo + tags: forgejo - name: Install ntfy import_role: From 3171aa5ead3c7e91448d1896d4da76b60390108f Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 24 Jun 2024 18:56:37 +0200 Subject: [PATCH 2/2] Make zerossl usage depend on having an api key --- roles/caddy/defaults/main.yml | 1 + roles/caddy/templates/config.json.j2 | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/caddy/defaults/main.yml b/roles/caddy/defaults/main.yml index 378f819..338f58c 100644 --- a/roles/caddy/defaults/main.yml +++ b/roles/caddy/defaults/main.yml @@ -9,3 +9,4 @@ caddy_use_https: yes caddy_tls_use_staging: no # caddy_email: your@email.here +# caddy_zerossl_api_key: your-zerossl-key-here-its-free diff --git a/roles/caddy/templates/config.json.j2 b/roles/caddy/templates/config.json.j2 index b104a25..6a13848 100644 --- a/roles/caddy/templates/config.json.j2 +++ b/roles/caddy/templates/config.json.j2 @@ -51,17 +51,19 @@ {% if caddy_tls_use_staging is sameas true %} "ca": "https://acme-staging-v02.api.letsencrypt.org/directory", {% endif %} - {%- if caddy_email is not undefined and not none %} + {%- if caddy_email is not undefined and not none %} "email": "{{ caddy_email }}", {% endif %} "module": "acme" + {%- if caddy_zerossl_api_key is not undefined and not none %} }, { - {%- if caddy_email is not undefined and not none %} - "email": "{{ caddy_email }}", - {% endif %} + "api_key": "{{ caddy_zerossl_api_key }}", "module": "zerossl" } + {% else %} + } + {% endif %} ] } ]