testing

.gitignore

@@ -1,13 +1,3 @@
 .vagrant
 .playbook
-/*.yml
-/*.yaml
-!backup.yml
-!moxie.yml
-!docker.yml
-!dockerbox.yml
-!hypervisor.yml
-!minecraft.yml
-!proxy.yml
-!unifi.yml
 /environments/

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/host_vars/proxy.yml

@@ -18,8 +18,6 @@ proxy:
       proxy_pass: "http://127.0.0.1:8080"
     - domain: "{{ gitea_domain }}"
       proxy_pass: "http://127.0.0.1:3000"
-    - domain: "{{ kutt_domain }}"
-      proxy_pass: "http://127.0.0.1:3030"
 
 # docker
 docker_users:
@@ -37,16 +35,3 @@ bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p
 gitea_domain: "git.{{ base_domain }}"
 gitea_version: 1
 gitea_dbpass: password
-
-# kutt
-kutt_version: latest
-kutt_redis_version: 6
-kutt_postgres_version: 12
-kutt_domain: "kutt.{{ base_domain }}"
-kutt_dbpass: password
-kutt_jwt_secret: long&random
-kutt_mail_user: kutt-noreply@example.com
-kutt_mail_host: smtp.example.com
-kutt_mail_password: realpassword
-kutt_report_email: realemail@example.com
-kutt_admin_emails: realemail@example.com

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

dev/proxy.yml

@@ -10,4 +10,3 @@
     - docker
     - gitea
     - bitwarden
-    - kutt

mediaserver.yml

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

roles/.gitignore

@@ -1,23 +1 @@
-# Sort roles: tail -n +6 roles/.gitignore | sort
+.gitignore
-/*
-!.gitignore
-!requirements.yml
-# roles
-!base*/
-!bitwarden*/
-!docker*/
-!gitea*/
-!jenkins*/
-!kutt*/
-!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/kutt/defaults/main.yml

@@ -1,16 +0,0 @@
-# container settings
-kutt_name: kutt
-kutt_default_domain: "{{ kutt_domain }}"
-kutt_webport: 3030
-kutt_web: "127.0.0.1:{{ kutt_webport }}"
-
-# database settings
-kutt_dbname: "{{ kutt_name }}"
-kutt_dbuser: "{{ kutt_name }}"
-kutt_postgres_volume: postgres_data
-
-# redis
-kutt_redis_volume: redis_data
-
-# host
-kutt_root: "{{ docker_compose_root }}/{{ kutt_name }}"

roles/kutt/handlers/main.yml

@@ -1,5 +0,0 @@
-- name: Restart Kutt
-  service:
-    name: "{{ docker_compose_service }}@{{ kutt_name }}"
-    state: restarted
-  listen: restart_kutt

roles/kutt/tasks/main.yml

@@ -1,22 +0,0 @@
-- name: Create Kutt directory
-  file:
-    path: "{{ kutt_root }}"
-    state: directory
-
-- name: Install Kutt's docker-compose file
-  template:
-    src: docker-compose.yml.j2
-    dest: "{{ kutt_root }}/docker-compose.yml"
-  notify: restart_kutt
-
-- name: Install Kutt's docker-compose variables
-  template:
-    src: compose-env.j2
-    dest: "{{ kutt_root }}/.env"
-  notify: restart_kutt
-
-- name: Start and enable Gitea service
-  service:
-    name: "{{ docker_compose_service }}@{{ kutt_name }}"
-    state: started
-    enabled: true

roles/kutt/templates/compose-env.j2

@@ -1,17 +0,0 @@
-# {{ ansible_managed }}
-kutt_version={{ kutt_version }}
-kutt_web={{ kutt_web }}
-kutt_domain={{ kutt_domain }}
-kutt_default_domain={{ kutt_default_domain }}
-kutt_jwt_secret={{ kutt_jwt_secret }}
-kutt_dbname={{ kutt_dbname }}
-kutt_dbuser={{ kutt_dbuser }}
-kutt_dbpass={{ kutt_dbpass }}
-kutt_mail_user={{ kutt_mail_user }}
-kutt_mail_host={{ kutt_mail_host }}
-kutt_mail_password={{ kutt_mail_password }}
-kutt_report_email={{ kutt_report_email }}
-kutt_admin_emails={{ kutt_admin_emails }}
-kutt_redis_version={{ kutt_redis_version }}
-kutt_postgres_version={{ kutt_postgres_version }}
-kutt_postgres_volume={{ kutt_postgres_volume }}

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

@@ -1,46 +0,0 @@
-version: "3.7"
-
-services:
-  kutt:
-    image: kutt/kutt:${kutt_version}
-    depends_on:
-      - postgres
-      - redis
-    command: ["./wait-for-it.sh", "postgres:5432", "--", "npm", "start"]
-    ports:
-      - ${kutt_web}:3000
-    environment:
-      SITE_NAME: ${kutt_domain}
-      DEFAULT_DOMAIN: ${kutt_default_domain}
-      JWT_SECRET: ${kutt_jwt_secret}
-
-      DB_HOST: postgres
-      DB_NAME: ${kutt_dbname}
-      DB_USER: ${kutt_dbuser}
-      DB_PASSWORD: ${kutt_dbpass}
-      REDIS_HOST: redis
-
-      MAIL_USER: ${kutt_mail_user}
-      MAIL_HOST: ${kutt_mail_host}
-      MAIL_PORT: ${kutt_mail_port}
-      MAIL_PASSWORD: ${kutt_mail_password}
-      REPORT_EMAIL: ${kutt_report_email}
-      ADMIN_EMAILS: ${kutt_admin_emails}
-
-  redis:
-    image: redis:${kutt_redis_version}
-    volumes:
-      - {{ kutt_redis_volume }}:/data
-
-  postgres:
-    image: postgres:${kutt_postgres_version}
-    environment:
-      POSTGRES_USER: ${kutt_dbuser}
-      POSTGRES_PASSWORD: ${kutt_dbpass}
-      POSTGRES_DB: ${kutt_dbname}
-    volumes:
-      - {{ kutt_postgres_volume }}:/var/lib/postgresql/data
-
-volumes:
-  {{ kutt_redis_volume }}:
-  {{ kutt_postgres_volume }}:

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

@@ -46,6 +46,12 @@ server {
     proxy_pass {{ item.proxy_pass }};
 {% if item.proxy_ssl_verify is defined and item.proxy_ssl_verify is false %}
     proxy_ssl_verify off;
+{% endif %}
+{% if item.websockets is defined and item.websockets %}
+    proxy_http_version 1.1;
+    proxy_set_header Connection $http_connection;
+    proxy_set_header Origin http://$host;
+    proxy_set_header Upgrade $http_upgrade;
 {% endif %}
   }
 }

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[11]="kutt.${DOMAIN}"
 
 # Get Vagrantbox guest IP
 VAGRANT_OUTPUT=$(vagrant ssh -c "hostname -I | cut -d' ' -f2" 2>/dev/null)