diff --git a/README.md b/README.md index b00c26c..037513b 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,9 @@ Attention: You still need to setup the borgbackup repository manually. Mandatory variable: - `caddy_email`: Email address to use for getting let's encrypt certificates +Optional variable: +- `caddy_plugins`: Comma separated list of caddyserver v1 plugins (default: `http.ratelimit`) + ### Cronmails Mandatory variable: - `cron_email`: Sender email address used by cron diff --git a/defaults/main.yml b/defaults/main.yml index a9ccf24..8e2a9b8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,6 +4,7 @@ borgbackup_ssh_id: "{{ ansible_user_dir }}/.ssh/id_ed25519" caddy_cachedir: "{{ ansible_user_dir }}/.ansbl-caddy-cache" +caddy_plugins: "http.ratelimit" telegraf_interval: "300s" telegraf_docker_file: "telegraf-docker.conf" diff --git a/tasks/caddy-install.yml b/tasks/caddy-install.yml index e1c9757..944506d 100644 --- a/tasks/caddy-install.yml +++ b/tasks/caddy-install.yml @@ -22,17 +22,17 @@ - name: caddyserver - Download caddy webserver (amd64) get_url: - url: "https://caddyserver.com/download/linux/amd64?plugins=http.ratelimit&license=personal" + url: "https://caddyserver.com/download/linux/amd64?plugins={{ caddy_plugins }}&license=personal" dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz" when: ansible_architecture == "x86_64" - name: caddyserver - Download caddy webserver (armv7/ raspberry pi) get_url: - url: "https://caddyserver.com/download/linux/arm7?plugins=http.ratelimit&license=personal" + url: "https://caddyserver.com/download/linux/arm7?plugins={{ caddy_plugins }}&license=personal" dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz" when: ansible_architecture == "armv7l" - name: caddyserver - Download caddy webserver (arm64) get_url: - url: "https://caddyserver.com/download/linux/arm64?plugins=http.ratelimit&license=personal" + url: "https://caddyserver.com/download/linux/arm64?plugins={{ caddy_plugins }}&license=personal" dest: "{{ caddy_cachedir }}/tmp/caddy.tar.gz" when: ansible_architecture == "aarch64" diff --git a/tasks/docker-Debian.yml b/tasks/docker-Debian.yml index 4d0d8d2..123e8d1 100644 --- a/tasks/docker-Debian.yml +++ b/tasks/docker-Debian.yml @@ -34,7 +34,7 @@ repo: "deb [arch={{ dpkg_arch.stdout }}] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" state: present when: ansible_facts['lsb']['id'] != "Raspbian" -- name: docker - Add docker CE repo (Rasbian) +- name: docker - Add docker CE repo (Raspbian) become: yes apt_repository: repo: "deb [arch={{ dpkg_arch.stdout }}] https://download.docker.com/linux/raspbian {{ ansible_distribution_release }} stable"