testing

dev/dockerbox.yml

@@ -8,6 +8,7 @@
     - docker
     - traefik
     - nextcloud
+    - gitea
     - jenkins
     - prometheus
     - nginx

dev/host_vars/dockerbox.yml

@@ -13,7 +13,6 @@ traefik_domain: traefik.vm.krislamo.org
 traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
-traefik_http_only: true # if behind reverse-proxy
 
 # nextcloud
 nextcloud_version: stable

dev/host_vars/mediaserver.yml

@@ -0,0 +1,26 @@
+base_domain: vm.krislamo.org
+
+# base
+allow_reboot: false
+manage_network: false
+
+# proxy
+proxy:
+  #production: true
+  dns_cloudflare:
+    opts: --test-cert
+    #email: realemail@example.com
+    #api_token: CLOUDFLARE_DNS01_API_TOKEN
+    wildcard_domains:
+      - "{{ base_domain }}"
+  servers:
+    - domain: "{{ jellyfin_domain }}"
+      proxy_pass: "http://127.0.0.1:8080"
+
+# docker
+docker_users:
+  - vagrant
+
+# jellyfin
+jellyfin_domain: "jellyfin.{{ base_domain }}"
+jellyfin_version: latest

dev/mediaserver.yml

@@ -0,0 +1,10 @@
+- name: Install Media Server
+  hosts: all
+  become: true
+  vars_files:
+    - host_vars/mediaserver.yml
+  roles:
+    - base
+    - proxy
+    - docker
+    - jellyfin

mediaserver.yml

@@ -0,0 +1,7 @@
+- name: Install Media Server
+  hosts: mediaservers
+  become: true
+  roles:
+    - base
+    - docker
+    - jellyfin

roles/.gitignore

@@ -1,20 +1 @@
-/*
+.gitignore
-!.gitignore
-!requirements.yml
-!base*/
-!bitwarden*/
-!docker*/
-!gitea*/
-!jenkins*/
-!libvirt*/
-!mariadb*/
-!minecraft*/
-!nextcloud*/
-!nginx*/
-!postgresql*/
-!prometheus*/
-!proxy*/
-!rsnapshot*/
-!traefik*/
-!unifi*/
-!wordpress*/

roles/base/handlers/main.yml

@@ -1,18 +1,24 @@
 - name: Reboot host
-  reboot:
+  ansible.builtin.reboot:
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host
   when: allow_reboot
 
 - name: Restart WireGuard
-  service:
+  ansible.builtin.service:
     name: wg-quick@wg0
     state: restarted
   listen: restart_wireguard
 
 - name: Restart Fail2ban
-  service:
+  ansible.builtin.service:
     name: fail2ban
     state: restarted
   listen: restart_fail2ban
+
+- name: Restart ddclient
+  ansible.builtin.service:
+    name: ddclient
+    state: restarted
+  listen: restart_ddclient

roles/base/tasks/ansible.yml

@@ -1,11 +1,11 @@
 - name: 'Install Ansible dependency: python3-apt'
-  shell: 'apt-get update && apt-get install python3-apt -y'
+  ansible.builtin.shell: 'apt-get update && apt-get install python3-apt -y'
   args:
     creates: /usr/lib/python3/dist-packages/apt
     warn: false
 
 - name: Install additional Ansible dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ item }}"
     state: present
     force_apt_get: true
@@ -17,7 +17,7 @@
     - python3-psycopg2
 
 - name: Create Ansible's temporary remote directory
-  file:
+  ansible.builtin.file:
     path: "~/.ansible/tmp"
     state: directory
     mode: 0700

roles/base/tasks/ddclient.yml

@@ -1,22 +1,17 @@
 - name: Install ddclient
-  apt:
+  ansible.builtin.apt:
     name: ddclient
     state: present
 
 - name: Install ddclient settings
-  template:
+  ansible.builtin.template:
     src: ddclient.conf.j2
     dest: /etc/ddclient.conf
+    mode: 0600
   register: ddclient_settings
 
 - name: Start ddclient and enable on boot
-  service:
+  ansible.builtin.service:
     name: ddclient
     state: started
     enabled: true
-
-- name: Restart ddclient
-  service:
-    name: ddclient
-    state: restarted
-  when: ddclient_settings.changed

roles/jellyfin/defaults/main.yml

@@ -0,0 +1,4 @@
+jellyfin_name: jellyfin
+jellyfin_volume: "{{ jellyfin_name }}"
+jellyfin_rooturl: "https://{{ jellyfin_domain }}"
+jellyfin_root: "{{ docker_compose_root }}/{{ jellyfin_name }}"

roles/jellyfin/handlers/main.yml

@@ -0,0 +1,6 @@
+- name: Restart Jellyfin
+  service:
+    name: "{{ docker_compose_service }}@{{ jellyfin_name }}"
+    state: restarted
+  listen: restart_jellyfin
+  

roles/jellyfin/tasks/main.yml

@@ -0,0 +1,37 @@
+- name: Create Jellyfin directory
+  ansible.builtin.file:
+    path: "{{ jellyfin_root }}"
+    state: directory
+
+- name: Create jellyfin user
+  user:
+    name: jellyfin
+    state: present
+
+- name: jellyfin user uid
+  getent:
+    database: passwd
+    key: jellyfin
+
+- name: jellyfin user gid
+  getent:
+    database: group
+    key: jellyfin
+
+- name: Install Jellyfin's docker-compose file
+  template:
+    src: docker-compose.yml.j2
+    dest: "{{ jellyfin_root }}/docker-compose.yml"
+  notify: restart_jellyfin
+
+- name: Install Jellyfin's docker-compose variables
+  template:
+    src: compose-env.j2
+    dest: "{{ jellyfin_root }}/.env"
+  notify: restart_jellyfin
+
+- name: Start and enable Jellyfin service
+  service:
+    name: "{{ docker_compose_service }}@{{ jellyfin_name }}"
+    state: started
+    enabled: true

roles/jellyfin/templates/compose-env.j2

@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+jellyfin_version={{ jellyfin_version }}
+jellyfin_name={{ jellyfin_name }}
+jellyfin_domain={{ jellyfin_domain }}
+jellyfin_rooturl={{ jellyfin_rooturl }}

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

@@ -0,0 +1,13 @@
+version: '3.7'
+
+services:
+  jellyfin:
+    image: "jellyfin/jellyfin:${jellyfin_version}"
+    container_name: "${jellyfin_name}"
+    volumes:
+      - ./config:/config
+      - ./cache:/cache
+      - {{ jellyfin_volume }}:/media
+
+volumes:
+  {{ jellyfin_volume }}:

roles/traefik/defaults/main.yml

@@ -1,18 +1,12 @@
-# Container settings
 traefik_name: traefik
-traefik_standalone: true
+traefik_dashboard: false
-traefik_http_only: false
+traefik_root: "/opt/{{ traefik_name }}"
-traefik_debug: false
-traefik_web_entry: "80:80"
-traefik_websecure_entry: "443:443"
 traefik_localonly: "10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8"
-
-# HTTPS settings
 traefik_production: false
 traefik_hsts_enable: false
 traefik_hsts_preload: false
 traefik_hsts_seconds: 0
-traefik_http_redirect: true
+traefik_http_redirect: false
-
+traefik_ports:
-# Host settings
+  - "80:80"
-traefik_root: "{{ docker_compose_root }}/{{ traefik_name }}"
+  - "443:443"

roles/traefik/handlers/main.yml

@@ -4,8 +4,11 @@
     state: touch
   listen: reload_traefik
 
-- name: Restart Traefik
+- name: Restart Traefik container
-  service:
+  docker_container:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
+    name: "{{ traefik_name }}"
-    state: restarted
+    image: traefik:{{ traefik_version }}
+    state: started
+    container_default_behavior: "no_defaults"
+    restart: yes
   listen: restart_traefik

roles/traefik/tasks/main.yml

@@ -1,8 +1,14 @@
-- name: Create Traefik directories
+- name: Create Traefik configuration directories
   file:
     path: "{{ traefik_root }}/config/dynamic"
     state: directory
 
+- name: Install static Traefik configuration
+  template:
+    src: traefik.yml.j2
+    dest: "{{ traefik_root }}/config/traefik.yml"
+  notify: restart_traefik
+
 - name: Install dynamic security configuration
   template:
     src: security.yml.j2
@@ -19,26 +25,32 @@
   loop: "{{ traefik_external }}"
   when: traefik_external is defined
 
-- name: Install Traefik's docker-compose file
+- name: Create Traefik network
-  template:
+  docker_network:
-    src: docker-compose.yml.j2
+    name: traefik
-    dest: "{{ traefik_root }}/docker-compose.yml"
-  notify: restart_traefik
 
-- name: Install Traefik's docker-compose variables
+- name: Start Traefik container
-  template:
+  docker_container:
-    src: compose-env.j2
+    name: "{{ traefik_name }}"
-    dest: "{{ traefik_root }}/.env"
+    image: traefik:{{ traefik_version }}
-  notify: restart_traefik
-
-- name: Install static Traefik configuration
-  template:
-    src: traefik.yml.j2
-    dest: "{{ traefik_root }}/config/traefik.yml"
-  notify: restart_traefik
-
-- name: Start and enable Traefik service
-  service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
     state: started
-    enabled: true
+    restart_policy: always
+    ports: "{{ traefik_ports }}"
+    container_default_behavior: "no_defaults"
+    networks_cli_compatible: "false"
+    networks:
+      - name: traefik
+    labels:
+      traefik.http.routers.traefik.rule: "Host(`{{ traefik_domain }}`)"
+      #traefik.http.middlewares.auth.basicauth.users: "{{ traefik_auth }}"
+      #traefik.http.middlewares.localonly.ipwhitelist.sourcerange: "{{ traefik_localonly }}"
+      #traefik.http.routers.traefik.tls.certresolver: letsencrypt
+      #traefik.http.routers.traefik.middlewares: "securehttps@file,auth@docker,localonly"
+      traefik.http.routers.traefik.service: "api@internal"
+      traefik.http.routers.traefik.entrypoints: websecure
+      traefik.http.routers.traefik.tls: "true"
+      traefik.docker.network: traefik
+      traefik.enable: "{{ traefik_dashboard | string }}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/compose-env.j2

@@ -1,8 +0,0 @@
-# {{ ansible_managed }}
-traefik_version={{ traefik_version }}
-traefik_name={{ traefik_name }}
-traefik_domain={{ traefik_domain }}
-traefik_dashboard={{ traefik_dashboard | string | lower }}
-traefik_debug={{ traefik_debug | string | lower }}
-traefik_web_entry={{ traefik_web_entry }}
-traefik_websecure_entry={{ traefik_websecure_entry }}

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

@@ -1,25 +0,0 @@
-version: '3.7'
-
-networks:
-  traefik:
-    name: traefik
-
-services:
-  traefik:
-    image: "traefik:${traefik_version}"
-    container_name: "${traefik_name}"
-    ports:
-      - "${traefik_web_entry:-80:80}"
-{% if traefik_standalone and not traefik_http_only %}
-      - "${traefik_websecure_entry:-443:443}"
-{% endif %}
-    networks:
-      - traefik
-    labels:
-      - "traefik.http.routers.traefik.rule=Host(`{{ traefik_domain }}`)"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.docker.network=traefik"
-      - "traefik.enable=${traefik_dashboard:-false}"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/traefik.yml.j2

@@ -10,7 +10,7 @@ providers:
 entrypoints:
   web:
     address: ':80'
-{% if traefik_http_redirect is defined and traefik_http_redirect and not traefik_http_only %}
+{% if traefik_http_redirect is defined and traefik_http_redirect %}
     http:
       redirections:
         entrypoint:
@@ -18,12 +18,10 @@ entrypoints:
           scheme: https
           permanent: true
 {% endif %}
-{% if not traefik_http_only is defined or not traefik_http_only %}
   websecure:
     address: ':443'
     http:
       tls: {}
-{% endif %}
 
 {% if traefik_acme_email is defined %}
 certificatesResolvers: