Merge branch 'adguard' into 'master'

Adguard

See merge request kdam0/vps!3

1 files changed, 54 insertions, 11 deletions

diff --git a/playbooks/deploy.yaml b/playbooks/deploy.yaml
index 08af211..e1e0970 100644
--- a/playbooks/deploy.yaml
+++ b/playbooks/deploy.yaml
@@ -5,26 +5,33 @@
 #   make dry-run file=playbooks/deploy.yaml tags=""
 #
 # Available tags:
-#   ddclient, wireguard, nginx, websites,
-#   samba, nextcloud, bitwarden, searxng,
+#   base, ddclient, wireguard, websites samba,
+#   nginx, nextcloud, bitwarden, searxng,
 #   monitoring, transmission, media_downloader
+#   photoprism, plex
 #
 # Install:
 #   make install
 #
-# ASSUMPTIONS:
-# You should already have docker installed.
-#   See the README.md for base image setup section.
-#
 ---
 
 ## Non Docker Services ##
 
 - hosts: compute
   gather_facts: true
+  tags: 'base'
+  become: true
+  roles:
+    - role: base
+      vars:
+        base_user: '{{ username }}'
+        base_user_password: '{{ vault_user_password }}'
+        base_hardware: '{{ hardware }}'
+
+- hosts: compute
+  gather_facts: true
   tags: 'ddclient'
   become: true
-  become_method: 'doas'
   roles:
     - role: ddclient
       vars:
@@ -37,7 +44,6 @@
   gather_facts: true
   tags: 'wireguard'
   become: true
-  become_method: 'doas'
   roles:
     - role: wireguard
       vars:
@@ -47,9 +53,9 @@
         wireguard_server_ip: '192.168.10.1/32'
         wireguard_peers:
           - peer_ip: '192.168.10.2/32'  # my phone
-            peer_key: '/mFv6y9QA8dhX/A9fFn+mzg/SZq4BZPeNofm1w754y8='
+            peer_key: 'QUirl0QsXC3P6D5t5VPlvDgfji1ZI5e0XhppBFLW9TY='
           - peer_ip: '192.168.10.3/32'  # personal laptop
-            peer_key: '6+t6FbEHSAOuzBtQwb0bDqfFa5Kvfkb2QIUGpRKA5Eg='
+            peer_key: 'pzqY/UxffV8O01K982jlgP1xJQphnglOdqVhOM2IUSc='
           - peer_ip: '192.168.10.4/32'  # vps
             peer_key: 'oz2jxeSUWD4r5g3y7XuSItqSiqOOJz8vulYYVXAsKS8='
 
@@ -70,7 +76,6 @@
   gather_facts: true
   tags: 'samba'
   become: true
-  become_method: 'doas'
   roles:
     - role: samba
       vars:
@@ -94,6 +99,17 @@
         nginx_static_html_root: '{{ vol_data }}/sites'
         nginx_certs_root: '{{ vol_data }}/letsencrypt'
 
+# - hosts: compute
+#   gather_facts: false
+#   tags: 'adguard'
+#   become: false
+#   roles:
+#     - role: adguard
+#       vars:
+#         adguard_domain: '{{ apps_conf_map["adguard"]["access_domain"] }}'
+#         adguard_host_port: '{{ apps_conf_map["adguard"]["port"] }}'
+#         adguard_data_root: '{{ vol_data }}/adguard'
+
 - hosts: compute
   gather_facts: false
   tags: 'nextcloud'
@@ -163,3 +179,30 @@
         monitoring_root_dir: '{{ vol_data }}/monitoring'
         monitoring_apps_confs: '{{ apps_conf_map | dict2items(key_name="app", value_name="conf") }}'
         monitoring_static_sites: '{{ nginx_websites }}'
+
+- hosts: compute
+  gather_facts: false
+  tags: 'photoprism'
+  become: false
+  roles:
+    - role: photoprism
+      vars:
+        photoprism_host_port: '{{ apps_conf_map["photoprism"]["port"] }}'
+        photoprism_admin_password: '{{ vault_photoprism_admin_password }}'
+        photoprism_data_dir: '{{ vol_data }}/photoprism'
+        photoprism_pics_root_dir: '{{ vol_media }}/pics'
+
+- hosts: compute
+  gather_facts: false
+  tags: 'plex'
+  become: false
+  roles:
+    - role: plex
+      vars:
+        plex_host_port: '{{ apps_conf_map["plex"]["port"] }}'
+        plex_claim: '{{ vault_plex_claim }}'
+        plex_library_dir: '{{ vol_media }}/plex'
+        plex_tv_dir: '{{ vol_media }}/media/tv'
+        plex_mov_dir: '{{ vol_media }}/media/mov'
+        plex_pic_dir: '{{ vol_media }}/pics'
+        plex_music_dir: '{{ vol_media }}/music'