testing

dev/host_vars/mediaserver.yml

@@ -1,37 +0,0 @@
-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: "{{ traefik_domain }}"
-      proxy_pass: "http://127.0.0.1:8000"
-    - domain: "{{ jellyfin_domain }}"
-      proxy_pass: "http://127.0.0.1:8000"
-
-# docker
-docker_users:
-  - vagrant
-
-# traefik
-traefik_version: latest
-traefik_dashboard: true
-traefik_domain: "traefik.{{ base_domain }}"
-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
-
-# jellyfin
-jellyfin_domain: "jellyfin.{{ base_domain }}"
-jellyfin_version: latest

dev/mediaserver.yml

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

mediaserver.yml

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

roles/.gitignore

@@ -0,0 +1,20 @@
+/*
+!.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,24 +1,18 @@
 - name: Reboot host
-  ansible.builtin.reboot:
+  reboot:
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host
   when: allow_reboot
 
 - name: Restart WireGuard
-  ansible.builtin.service:
+  service:
     name: wg-quick@wg0
     state: restarted
   listen: restart_wireguard
 
 - name: Restart Fail2ban
-  ansible.builtin.service:
+  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'
-  ansible.builtin.shell: 'apt-get update && apt-get install python3-apt -y'
+  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
-  ansible.builtin.apt:
+  apt:
     name: "{{ item }}"
     state: present
     force_apt_get: true
@@ -17,7 +17,7 @@
     - python3-psycopg2
 
 - name: Create Ansible's temporary remote directory
-  ansible.builtin.file:
+  file:
     path: "~/.ansible/tmp"
     state: directory
     mode: 0700

roles/base/tasks/ddclient.yml

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

roles/jellyfin/defaults/main.yml

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

roles/jellyfin/handlers/main.yml

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

roles/jellyfin/tasks/main.yml

@@ -1,37 +0,0 @@
-- 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

@@ -1,5 +0,0 @@
-# {{ 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

@@ -1,29 +0,0 @@
-version: '3.7'
-
-volumes:
-  {{ jellyfin_volume }}:
-
-networks:
-  traefik:
-    external: true
-
-services:
-  jellyfin:
-    image: "jellyfin/jellyfin:${jellyfin_version}"
-    container_name: "${jellyfin_name}"
-    networks:
-      - traefik
-    labels:
-      - "traefik.http.routers.{{ jellyfin_router }}.rule=Host(`{{ jellyfin_domain }}`)"
-{% if traefik_http_only %}
-      - "traefik.http.routers.{{ jellyfin_router }}.entrypoints=web"
-{% else %}
-      - "traefik.http.routers.{{ jellyfin_router }}.entrypoints=websecure"
-{% endif %}
-      - "traefik.http.services.{{ jellyfin_router }}.loadbalancer.server.port=8096"
-      - "traefik.docker.network=traefik"
-      - "traefik.enable=true"
-    volumes:
-      - ./config:/config
-      - ./cache:/cache
-      - {{ jellyfin_volume }}:/media

roles/traefik/defaults/main.yml

@@ -3,8 +3,8 @@ traefik_name: traefik
 traefik_standalone: true
 traefik_http_only: false
 traefik_debug: false
-traefik_web_entry: "127.0.0.1:8000"
+traefik_web_entry: "80:80"
-traefik_websecure_entry: "127.0.0.1:8443"
+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

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

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

update-hosts.sh

@@ -14,7 +14,6 @@ HOST[8]="wordpress.${DOMAIN}"
 HOST[9]="site1.wordpress.${DOMAIN}"
 HOST[10]="site2.wordpress.${DOMAIN}"
 HOST[11]="unifi.${DOMAIN}"
-HOST[12]="jellyfin.${DOMAIN}"
 
 # Get Vagrantbox guest IP
 VAGRANT_OUTPUT=$(vagrant ssh -c "hostname -I | cut -d' ' -f2" 2>/dev/null)