testing

- Add new primary GPG key in dev config for compose repos
- Slight reorganization of the dockerbox production playbook
- Remove group management in the docker role
- Move HSTS inside the location block
- Add git ignore entry for .ansible files
- Add X-Forwarded-Proto proxy header

.github/workflows/vagrant.yml

@@ -3,8 +3,9 @@ name: homelab-ci
 on:
   push:
     branches:
-      - main
+      - github_actions
-      - testing
+      # - main
+      # - testing
 
 jobs:
   homelab-ci:

.gitignore

@@ -1,4 +1,5 @@
+.ansible*
+/environments/
 .playbook
 .vagrant*
 .vscode
-/environments/

dev/host_vars/dockerbox.yml

@@ -4,8 +4,12 @@ manage_network: false
 
 # Import my GPG key for git signature verification
 root_gpgkeys:
+  - name: kris@lamoureux.io
+    id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
+  # Older key, but still in use
   - name: kris@lamoureux.io
     id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+    server: keyserver.ubuntu.com
 
 # proxy
 proxy:
@@ -33,7 +37,7 @@ docker_compose_deploy:
   # Nextcloud
   - name: nextcloud
     url: https://github.com/krislamo/nextcloud
-    version: 0abc5cc6ba64ed94b7ddc6fd934f0fd62b8a6d11
+    version: fe6d349749f178e91ae7ff726d557f48ebf84356
     env:
       DATA: ./data
 

dev/host_vars/podman.yml

@@ -0,0 +1,46 @@
+##############
+#### base ####
+##############
+
+allow_reboot: false
+manage_network: false
+
+users:
+  kris:
+    uid: 1001
+    gid: 1001
+    home: true
+    ansible_temp: true
+
+################
+#### podman ####
+################
+
+user_namespaces:
+  - kris
+
+podman_compose_deploy:
+  kris:
+    root: /home/kris/podman_root
+    trusted_keys:
+      - id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+        keyserver: keyserver.ubuntu.com
+    compose:
+      - name: traefik
+        url: https://github.com/krislamo/traefik
+        version: d62bd06b37ecf0993962b0449a9d708373f9e381
+        enabled: true
+        accept_newhostkey: true # Consider verifying manually instead
+        env:
+          DASHBOARD: true
+
+###################
+#### Bitwarden ####
+###################
+
+# Get Installation ID & Key at https://bitwarden.com/host/
+bitwarden_domain: vault.local.krislamo.org
+bitwarden_dbpass: password
+bitwarden_install_id: 4ea840a3-532e-4cb6-a472-abd900728b23
+bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p
+#bitwarden_prodution: true

dev/podman.yml

@@ -0,0 +1,9 @@
+- name: Install Podman server
+  hosts: all
+  become: true
+  vars_files:
+    - host_vars/podman.yml
+  roles:
+    - base
+    - podman
+    - bitwarden

playbooks/docker.yml

@@ -4,4 +4,5 @@
   roles:
     - base
     - jenkins
+    - proxy
     - docker

playbooks/dockerbox.yml

@@ -3,9 +3,9 @@
   become: true
   roles:
     - base
+    - jenkins
     - docker
+    - mariadb
     - traefik
     - nextcloud
-    - jenkins
+    - proxy
-    - prometheus
-    - nginx

roles/base/tasks/samba.yml

@@ -26,7 +26,7 @@
   ansible.builtin.template:
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
-    mode: "700"
+    mode: "644"
   notify: restart_samba
 
 - name: Start smbd and enable on boot

roles/base/tasks/system.yml

@@ -80,14 +80,30 @@
     state: present
     uid: "{{ item.value.uid }}"
     group: "{{ item.value.gid }}"
+    groups: "{{ item.value.groups | default([]) }}"
     shell: "{{ item.value.shell | default('/bin/bash') }}"
     create_home: "{{ item.value.home | default(false) }}"
+    home: "{{ item.value.homedir | default('/home/' + item.key) }}"
     system: "{{ item.value.system | default(false) }}"
   loop: "{{ users | dict2items }}"
   loop_control:
     label: "{{ item.key }}"
   when: users is defined
 
+- name: Create Ansible's temporary remote directory for users
+  ansible.builtin.file:
+    path: "{{ item.value.homedir | default('/home/' + item.key) }}/.ansible/tmp"
+    state: directory
+    mode: "700"
+    owner: "{{ item.key }}"
+    group: "{{ item.value.gid }}"
+  loop: "{{ users | dict2items }}"
+  loop_control:
+    label: "{{ item.key }}"
+  when:
+    - users is defined
+    - item.value.ansible_temp | default(false)
+
 - name: Set authorized_keys for system users
   ansible.posix.authorized_key:
     user: "{{ item.key }}"

roles/base/tasks/wireguard.yml

@@ -18,6 +18,28 @@
     src: /etc/wireguard/privatekey
   register: wgkey
 
+- name: Check if WireGuard preshared key file exists
+  ansible.builtin.stat:
+    path: /etc/wireguard/presharedkey-{{ item.name }}
+  loop: "{{ wireguard.peers }}"
+  loop_control:
+    label: "{{ item.name }}"
+  register: presharedkey_files
+
+- name: Grab WireGuard preshared key for configuration
+  ansible.builtin.slurp:
+    src: /etc/wireguard/presharedkey-{{ item.item.name }}
+  register: wgshared
+  loop: "{{ presharedkey_files.results }}"
+  loop_control:
+    label: "{{ item.item.name }}"
+  when: item.stat.exists
+
+- name: Grab WireGuard private key for configuration
+  ansible.builtin.slurp:
+    src: /etc/wireguard/privatekey
+  register: wgkey
+
 - name: Install WireGuard configuration
   ansible.builtin.template:
     src: wireguard.j2

roles/base/templates/wireguard.j2

@@ -1,4 +1,6 @@
-[Interface]
+# {{ ansible_managed }}
+
+[Interface] # {{ ansible_hostname }}
 PrivateKey = {{ wgkey['content'] | b64decode | trim }}
 Address = {{ wireguard.address }}
 {% if wireguard.listenport is defined %}
@@ -6,8 +8,26 @@ ListenPort = {{ wireguard.listenport }}
 {% endif %}
 
 {% for peer in wireguard.peers %}
+{% if peer.name is defined %}
+[Peer] # {{ peer.name }}
+{% else %}
 [Peer]
+{% endif %}
 PublicKey = {{ peer.publickey }}
+{% if peer.presharedkey is defined %}
+PresharedKey = {{ peer.presharedkey }}
+{% else %}
+{% set preshared_key = (
+    wgshared.results
+    | selectattr('item.item.name', 'equalto', peer.name)
+    | first
+  ).content
+  | default(none)
+%}
+{% if preshared_key is not none %}
+PresharedKey = {{ preshared_key | b64decode | trim }}
+{% endif %}
+{% endif %}
 {% if peer.endpoint is defined %}
 Endpoint = {{ peer.endpoint }}
 {% endif %}

roles/docker/tasks/main.yml

@@ -24,15 +24,21 @@
 
 - name: Install/uninstall Docker from Debian repositories
   ansible.builtin.apt:
-    name: ['docker.io', 'docker-compose', 'containerd', 'runc']
+    name: ["docker.io", "docker-compose", "containerd", "runc"]
     state: "{{ 'absent' if docker_official else 'present' }}"
     autoremove: true
     update_cache: true
 
 - name: Install/uninstall Docker from Docker repositories
   ansible.builtin.apt:
-    name: ['docker-ce', 'docker-ce-cli', 'containerd.io',
+    name:
-           'docker-buildx-plugin', 'docker-compose-plugin']
+      [
+        "docker-ce",
+        "docker-ce-cli",
+        "containerd.io",
+        "docker-buildx-plugin",
+        "docker-compose-plugin",
+      ]
     state: "{{ 'present' if docker_official else 'absent' }}"
     autoremove: true
     update_cache: true
@@ -135,14 +141,6 @@
     label: "{{ item.name }}"
   when: docker_compose_deploy is defined and item.env is defined
 
-- name: Add users to docker group
-  ansible.builtin.user:
-    name: "{{ item }}"
-    groups: docker
-    append: true
-  loop: "{{ docker_users }}"
-  when: docker_users is defined
-
 - name: Start Docker and enable on boot
   ansible.builtin.service:
     name: docker

roles/jellyfin/templates/docker-compose.yml.j2

@@ -15,7 +15,7 @@ services:
     networks:
       - traefik
     labels:
-      - "traefik.http.routers.{{ jellyfin_router }}.rule=Host(`{{ jellyfin_domain }}`)"
+      - "traefik.http.routers.{{ jellyfin_router }}.rule=Host({{ jellyfin_domains }})"
 {% if traefik_http_only %}
       - "traefik.http.routers.{{ jellyfin_router }}.entrypoints=web"
 {% else %}

roles/mariadb/tasks/main.yml

@@ -16,10 +16,12 @@
     regex: "^bind-address"
     line: "bind-address            = {{ ansible_facts.docker0.ipv4.address }}"
   notify: restart_mariadb
+  when: ansible_facts.docker0 is defined
 
 - name: Flush handlers to ensure MariaDB restarts immediately
   ansible.builtin.meta: flush_handlers
   tags: restart_mariadb
+  when: ansible_facts.docker0 is defined
 
 - name: Allow database connections from Docker
   community.general.ufw:

roles/podman/defaults/main.yml

@@ -0,0 +1,4 @@
+# Default configuration for podman role
+podman_repos_keytype: ed25519
+podman_ssh_key_path: "{{ ansible_user_dir }}/.ssh"
+podman_nodocker: false

roles/podman/handlers/main.yml

@@ -0,0 +1,54 @@
+- name: Reload systemd manager configuration
+  ansible.builtin.systemd:
+    daemon_reload: true
+    scope: user
+  become: true
+  become_user: "{{ podman_user }}"
+  listen: podman_compose_systemd
+
+- name: Find which services had a podman-compose.yml updated
+  ansible.builtin.set_fact:
+    podman_compose_restart_list:
+      "{{ (podman_compose_restart_list | default([])) + [{'user': podman_user,
+      'service': item.item.name}] }}"
+  loop: "{{ podman_compose_update.results }}"
+  loop_control:
+    label: "{{ podman_user }}/{{ item.item.name }}"
+  when: item.changed
+  listen: podman_compose_restart
+
+- name: Find which services had their .env updated
+  ansible.builtin.set_fact:
+    podman_compose_restart_list:
+      "{{ (podman_compose_restart_list | default([])) + [{'user': podman_user,
+      'service': item.item.name}] }}"
+  loop: "{{ podman_compose_env_update.results }}"
+  loop_control:
+    label: "{{ podman_user }}/{{ item.item.name }}"
+  when: item.changed
+  listen: podman_compose_restart
+
+- name: Restart podman-compose services
+  ansible.builtin.systemd:
+    state: restarted
+    name: "podman-compose@{{ item.service }}"
+    scope: user
+  become: true
+  become_user: "{{ item.user }}"
+  loop: "{{ podman_compose_restart_list | default([]) | unique }}"
+  when: podman_compose_restart_list is defined
+  listen: podman_compose_restart
+
+- name: Start podman-compose services and enable on boot
+  ansible.builtin.systemd:
+    name: "podman-compose@{{ item.name }}"
+    state: started
+    enabled: true
+    scope: user
+  become: true
+  become_user: "{{ podman_user }}"
+  loop: "{{ podman_compose }}"
+  loop_control:
+    label: "{{ podman_user }}/{{ item.name }}"
+  when: item.enabled is defined and item.enabled is true
+  listen: podman_compose_enable

roles/podman/tasks/deploy.yml

@@ -0,0 +1,182 @@
+- name: Get user info for podman compose user
+  ansible.builtin.getent:
+    database: passwd
+    key: "{{ podman_user }}"
+  register: podman_user_info
+
+- name: Set user-specific variables
+  ansible.builtin.set_fact:
+    podman_rootdir: "{{ podman_compose_config.root }}"
+    podman_userid: "{{ podman_user_info.ansible_facts.getent_passwd[podman_user][1] }}"
+    podman_compose: "{{ podman_compose_config.compose }}"
+    podman_repos: "{{ podman_compose_config.root }}/.compose_repos"
+
+- name: Create podman-compose root directory for user
+  ansible.builtin.file:
+    path: "{{ podman_rootdir }}"
+    state: directory
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0700"
+
+- name: Create user systemd directory
+  ansible.builtin.file:
+    path: "/home/{{ podman_user }}/.config/systemd/user"
+    state: directory
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0755"
+
+- name: Install podman-compose systemd service for user
+  ansible.builtin.template:
+    src: podman-compose.service.j2
+    dest: "/home/{{ podman_user }}/.config/systemd/user/podman-compose@.service"
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0644"
+  notify: podman_compose_systemd
+
+- name: Create directories for cloning podman-compose repositories
+  ansible.builtin.file:
+    path: "{{ repo_dir }}"
+    state: directory
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0700"
+  loop:
+    - "{{ podman_repos }}"
+  loop_control:
+    loop_var: repo_dir
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Create .ssh directory for podman compose user
+  ansible.builtin.file:
+    path: "{{ podman_ssh_key_path }}"
+    state: directory
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0700"
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Generate OpenSSH deploy keys for podman-compose clones
+  community.crypto.openssh_keypair:
+    path: "{{ podman_ssh_key_path }}/podman-id_{{ podman_repos_keytype }}"
+    type: "{{ podman_repos_keytype }}"
+    comment: "{{ ansible_hostname }}-{{ podman_user }}-deploy-key"
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0600"
+    state: present
+  when: podman_compose is defined
+
+- name: Import trusted GPG keys for podman-compose projects
+  ansible.builtin.command:
+    cmd: "gpg --keyserver {{ key.keyserver | default('keys.openpgp.org') }} --recv-key {{ key.id }}"
+  become: true
+  become_user: "{{ podman_user }}"
+  loop: "{{ podman_compose_config.trusted_keys }}"
+  loop_control:
+    loop_var: key
+    label: "{{ key.id }}"
+  changed_when: false
+  when: podman_compose_config.trusted_keys is defined
+
+- name: Clone external podman-compose projects
+  ansible.builtin.git:
+    repo: "{{ project.url }}"
+    dest: "{{ podman_repos }}/{{ project.name }}"
+    version: "{{ project.version }}"
+    accept_newhostkey: "{{ project.accept_newhostkey | default(false) }}"
+    gpg_whitelist: "{{ (project.trusted_keys | default(podman_compose_config.trusted_keys | default([]))) | map(attribute='id') | list }}"
+    verify_commit: >-
+      {{ true if (project.trusted_keys is defined and project.trusted_keys) or
+         (podman_compose_config.trusted_keys is defined and podman_compose_config.trusted_keys)
+         else false }}
+    key_file: "{{ podman_ssh_key_path }}/podman-id_{{ podman_repos_keytype }}"
+  become: true
+  become_user: "{{ podman_user }}"
+  loop: "{{ podman_compose }}"
+  loop_control:
+    loop_var: project
+    label: "{{ project.url }}"
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Create directories for podman-compose projects
+  ansible.builtin.file:
+    path: "{{ podman_rootdir }}/{{ project.name }}"
+    state: directory
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0700"
+  loop: "{{ podman_compose }}"
+  loop_control:
+    loop_var: project
+    label: "{{ project.name }}"
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Synchronize podman-compose.yml (or docker-compose.yml)
+  ansible.posix.synchronize:
+    src: "{{ podman_repos }}/{{ project.name }}/{{ project.path | default('docker-compose.yml') }}"
+    dest: "{{ podman_rootdir }}/{{ project.name }}/docker-compose.yml"
+    owner: false
+    group: false
+  delegate_to: "{{ inventory_hostname }}"
+  register: podman_compose_update
+  notify:
+    - podman_compose_restart
+    - podman_compose_enable
+  loop: "{{ podman_compose | default([]) }}"
+  loop_control:
+    loop_var: project
+    label: "{{ project.name }}"
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Fix ownership of synchronized compose files
+  ansible.builtin.file:
+    path: "{{ podman_rootdir }}/{{ project.name }}/docker-compose.yml"
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0600"
+  loop: "{{ podman_compose | default([]) }}"
+  loop_control:
+    loop_var: project
+    label: "{{ project.name }}"
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0
+
+- name: Set environment variables for podman-compose projects
+  ansible.builtin.template:
+    src: podman-compose-env.j2
+    dest: "{{ podman_rootdir }}/{{ project.name }}/.env"
+    owner: "{{ podman_user }}"
+    group: "{{ podman_user }}"
+    mode: "0600"
+  register: podman_compose_env_update
+  notify:
+    - podman_compose_restart
+    - podman_compose_enable
+  no_log: true
+  loop: "{{ podman_compose }}"
+  loop_control:
+    loop_var: project
+    label: "{{ project.name }}"
+  when: podman_compose is defined and project.env is defined
+
+- name: Enable lingering for podman compose user
+  ansible.builtin.command:
+    cmd: "loginctl enable-linger {{ podman_user }}"
+  changed_when: false
+  when:
+    - podman_compose is defined
+    - podman_compose | length > 0

roles/podman/tasks/main.yml

@@ -0,0 +1,77 @@
+- name: Install Podman
+  ansible.builtin.apt:
+    name: ["podman", "podman-compose", "podman-docker"]
+    state: present
+
+- name: Get user info for namespace users
+  ansible.builtin.getent:
+    database: passwd
+    key: "{{ item }}"
+  loop: "{{ user_namespaces }}"
+  register: user_info
+
+- name: Configure /etc/subuid for rootless users
+  ansible.builtin.lineinfile:
+    path: "/etc/subuid"
+    line:
+      "{{ item.item }}:{{ 100000 +
+      ((item.ansible_facts.getent_passwd[item.item][1] | int - 1000) * 65536)
+      }}:65536"
+    regexp: "^{{ item.item }}:"
+    create: true
+    backup: true
+    mode: "0644"
+  loop: "{{ user_info.results }}"
+
+- name: Configure /etc/subgid for rootless users
+  ansible.builtin.lineinfile:
+    path: "/etc/subgid"
+    line:
+      "{{ item.item }}:{{ 100000 +
+      ((item.ansible_facts.getent_passwd[item.item][1] | int - 1000) * 65536)
+      }}:65536"
+    regexp: "^{{ item.item }}:"
+    create: true
+    backup: true
+    mode: "0644"
+  loop: "{{ user_info.results }}"
+
+- name: Create nodocker file to disable Docker CLI emulation message
+  ansible.builtin.file:
+    path: /etc/containers/nodocker
+    state: touch
+    owner: root
+    group: root
+    mode: "0644"
+  when: podman_nodocker | bool
+
+- name: Create global containers config directory
+  ansible.builtin.file:
+    path: /etc/containers
+    state: directory
+    mode: "0755"
+
+- name: Configure global containers.conf for rootless
+  ansible.builtin.copy:
+    content: |
+      [engine]
+      cgroup_manager = "cgroupfs"
+      events_logger = "journald"
+      runtime = "crun"
+    dest: /etc/containers/containers.conf
+    mode: "0644"
+    backup: true
+
+- name: Install git for repository cloning
+  ansible.builtin.apt:
+    name: git
+    state: present
+  when: podman_compose_deploy is defined
+
+- name: Deploy Podman compose projects for each user
+  ansible.builtin.include_tasks: deploy.yml
+  vars:
+    podman_user: "{{ item.key }}"
+    podman_compose_config: "{{ item.value }}"
+  loop: "{{ podman_compose_deploy | dict2items }}"
+  when: podman_compose_deploy is defined

roles/podman/templates/podman-compose-env.j2

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+{% if item.env is defined %}
+{% for key, value in item.env.items() %}
+{% if value is boolean %}
+{{ key }}={{ value | lower }}
+{% else %}
+{{ key }}={{ value }}
+{% endif %}
+{% endfor %}
+{% endif %}

roles/podman/templates/podman-compose.service.j2

@@ -0,0 +1,17 @@
+[Unit]
+Description=%i podman-compose service for {{ podman_user }}
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+WorkingDirectory={{ podman_rootdir }}/%i
+ExecStart=/usr/bin/podman-compose up -d --remove-orphans
+ExecStop=/usr/bin/podman-compose down
+Environment="PODMAN_USERNS=keep-id"
+Environment="PODMAN_SOCKET_PATH=/run/user/{{ podman_userid }}/podman/podman.sock"
+TimeoutStartSec=0
+
+[Install]
+WantedBy=default.target

roles/proxy/tasks/main.yml

@@ -45,10 +45,11 @@
   register: nginx_sites
 
 - name: Generate self-signed certificate
-  ansible.builtin.command: 'openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes \
+  ansible.builtin.command:
-          -subj   "/C=US/ST=Local/L=Local/O=Org/OU=IT/CN=example.com" \
+    'openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes \
-          -keyout /etc/ssl/private/nginx-selfsigned.key \
+    -subj   "/C=US/ST=Local/L=Local/O=Org/OU=IT/CN=example.com" \
-          -out    /etc/ssl/certs/nginx-selfsigned.crt'
+    -keyout /etc/ssl/private/nginx-selfsigned.key \
+    -out    /etc/ssl/certs/nginx-selfsigned.crt'
   args:
     creates: /etc/ssl/certs/nginx-selfsigned.crt
   when: proxy.production is not defined or not proxy.production
@@ -56,15 +57,22 @@
 
 - name: Install LE's certbot
   ansible.builtin.apt:
-    name: ['certbot', 'python3-certbot-dns-cloudflare']
+    name: ["certbot", "python3-certbot-dns-cloudflare"]
     state: present
   when: proxy.production is defined and proxy.production
 
+- name: Grab Cloudflare API token for configuration
+  ansible.builtin.slurp:
+    src: /root/.cloudflare-api
+  register: cfapi
+  when: proxy.production is defined and proxy.production and proxy.dns_cloudflare is defined
+
 - name: Install Cloudflare API token
   ansible.builtin.template:
     src: cloudflare.ini.j2
     dest: /root/.cloudflare.ini
     mode: "400"
+  diff: false
   when: proxy.production is defined and proxy.production and proxy.dns_cloudflare is defined
 
 - name: Create nginx post renewal hook directory
@@ -78,19 +86,19 @@
   ansible.builtin.copy:
     src: reload-nginx.sh
     dest: /etc/letsencrypt/renewal-hooks/post/reload-nginx.sh
-    mode: '0755'
+    mode: "0755"
   when: proxy.production is defined and proxy.production
 
 - name: Run Cloudflare DNS-01 challenges on wildcard domains
   ansible.builtin.shell: '/usr/bin/certbot certonly \
-            --non-interactive \
+    --non-interactive \
-            --agree-tos \
+    --agree-tos \
-            --email "{{ proxy.dns_cloudflare.email }}" \
+    --email "{{ proxy.dns_cloudflare.email }}" \
-            --dns-cloudflare \
+    --dns-cloudflare \
-            --dns-cloudflare-credentials /root/.cloudflare.ini \
+    --dns-cloudflare-credentials /root/.cloudflare.ini \
-            -d "*.{{ item }}" \
+    -d "*.{{ item }}" \
-            -d "{{ item }}" \
+    -d "{{ item }}" \
-            {{ proxy.dns_cloudflare.opts | default("") }}'
+    {{ proxy.dns_cloudflare.opts | default("") }}'
   args:
     creates: "/etc/letsencrypt/live/{{ item }}/fullchain.pem"
   loop: "{{ proxy.dns_cloudflare.wildcard_domains }}"

roles/proxy/templates/cloudflare.ini.j2

@@ -1,2 +1,2 @@
 # Cloudflare API token used by Certbot
-dns_cloudflare_api_token = {{ proxy.dns_cloudflare.api_token }}
+dns_cloudflare_api_token = {{ cfapi['content'] | b64decode | trim }}

roles/proxy/templates/server-nginx.conf.j2

@@ -28,14 +28,20 @@ server {
   ssl_certificate     /etc/ssl/certs/nginx-selfsigned.crt;
   ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
 {% endif %}
-{% if item.hsts is defined %}
-  add_header Strict-Transport-Security "max-age={{ item.hsts }}" always;
-{% endif %}
 {% if item.client_max_body_size is defined %}
   client_max_body_size {{ item.client_max_body_size }};
 {% endif %}
   location / {
-{% if item.restrict is defined and item.restrict  %}
+{% if item.hsts is defined %}
+    add_header Strict-Transport-Security "max-age={{ item.hsts }}" always;
+{% endif %}
+{% if item.allowedips is defined %}
+{% for ip in item.allowedips %}
+    allow {{ ip }};
+{% endfor %}
+    deny all;
+{% endif %}
+{% if item.restrict is defined and item.restrict %}
     auth_basic "{{ item.restrict_name | default('Restricted Access') }}";
     auth_basic_user_file {{ item.restrict_file | default('/etc/nginx/.htpasswd') }};
     proxy_set_header Authorization "";
@@ -43,6 +49,7 @@ server {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_pass {{ item.proxy_pass }};
 {% if item.proxy_ssl_verify is defined and item.proxy_ssl_verify is false %}
     proxy_ssl_verify off;