diff options
| -rw-r--r-- | molecule/raspberrypi/converge.yml | 4 | ||||
| -rw-r--r-- | roles/caddy/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/cgit/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/cloudflared/tasks/install-alpine.yml | 28 | ||||
| -rw-r--r-- | roles/grafana/templates/datasources/prometheus.yml.j2 | 1 |
5 files changed, 23 insertions, 15 deletions
diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml index ebbb1cbe..499b37cf 100644 --- a/molecule/raspberrypi/converge.yml +++ b/molecule/raspberrypi/converge.yml @@ -47,7 +47,7 @@ pihole_password: "{{ ('changeme' | hash('sha256') | hash('sha256'))[:64] }}" pihole_dhcp_enabled: false wireguard_autostart_connection: "" - proxy_type: "nginx" + proxy_type: "caddy" gateway_enabled: true gateway_local_ipv4_subnet: "10.0.0.0/24" grafana_dashboards: @@ -87,7 +87,7 @@ - role: "usbutils" - role: "wireguard" - role: "gateway" - - role: "proxy" + - role: "caddy" - role: "wg_portal" - role: "pihole" - role: "prometheus" diff --git a/roles/caddy/defaults/main.yml b/roles/caddy/defaults/main.yml deleted file mode 100644 index ed97d539..00000000 --- a/roles/caddy/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml index a2436b50..17e7abaf 100644 --- a/roles/cgit/tasks/main.yml +++ b/roles/cgit/tasks/main.yml @@ -36,7 +36,7 @@ - name: "Deploy authorized_keys" become: true - ansible.builtin.authorized_key: + ansible.posix.authorized_key: user: "{{ cgit_ssh_user }}" key: "{{ item }}" state: present @@ -49,7 +49,7 @@ state: directory owner: "{{ cgit_ssh_user }}" group: "{{ cgit_ssh_user }}" - mode: "0755" + mode: "2755" - name: "Deploy cgitrc" become: true diff --git a/roles/cloudflared/tasks/install-alpine.yml b/roles/cloudflared/tasks/install-alpine.yml index 28437fc9..d828d0b6 100644 --- a/roles/cloudflared/tasks/install-alpine.yml +++ b/roles/cloudflared/tasks/install-alpine.yml @@ -1,18 +1,26 @@ --- -- name: "Check if cloudflared binary exists" - ansible.builtin.stat: - path: "/usr/local/bin/cloudflared" - register: cloudflared_binary - -- name: "Download cloudflared binary" +- name: "Add Cloudflare APK repo key" become: true ansible.builtin.get_url: - url: "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64" - dest: "/usr/local/bin/cloudflared" - mode: "0755" + url: "https://pkg.cloudflare.com/cloudflare-main.pub" + dest: "/etc/apk/keys/cloudflare-main.pub" + mode: "0644" owner: "root" group: "root" - when: not cloudflared_binary.stat.exists + +- name: "Add Cloudflare APK repository" + become: true + ansible.builtin.lineinfile: + path: "/etc/apk/repositories" + line: "https://pkg.cloudflare.com/cloudflared/apk" + state: present + +- name: "Install cloudflared" + become: true + ansible.builtin.package: + name: "cloudflared" + state: present + update_cache: true - name: "Deploy cloudflared OpenRC service" become: true diff --git a/roles/grafana/templates/datasources/prometheus.yml.j2 b/roles/grafana/templates/datasources/prometheus.yml.j2 index 1c60e9d9..431e565a 100644 --- a/roles/grafana/templates/datasources/prometheus.yml.j2 +++ b/roles/grafana/templates/datasources/prometheus.yml.j2 @@ -1,3 +1,4 @@ +--- apiVersion: 1 datasources: |