testing

dev/dockerbox.yml

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

dev/host_vars/mediaserver.yml

@@ -1,26 +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: "{{ 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

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

dockerbox.yml

@@ -1,17 +1,3 @@
-# Copyright (C) 2020  Kris Lamoureux
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 - name: Install Docker Box Server
   hosts: dockerhosts
   become: true

mediaserver.yml

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

roles/.gitignore

@@ -1 +1,20 @@
-.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

@@ -6,19 +6,13 @@
   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,4 +0,0 @@
-jellyfin_name: jellyfin
-jellyfin_volume: "{{ jellyfin_name }}"
-jellyfin_rooturl: "https://{{ jellyfin_domain }}"
-jellyfin_root: "{{ docker_compose_root }}/{{ jellyfin_name }}"

roles/jellyfin/handlers/main.yml

@@ -1,6 +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,13 +0,0 @@
-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 }}: