Merge branch 'adguard' into 'master'

Adguard

See merge request kdam0/vps!3

3 files changed, 61 insertions, 28 deletions

diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
index 12fd063..7b27440 100644
--- a/group_vars/all/vars.yaml
+++ b/group_vars/all/vars.yaml
@@ -1,9 +1,21 @@
+# The value in this file correspond to MY SETUP.
+# You will need to change these to reflect yours.
 ---
 
+# This is the secondary user you want to setup.
+# Passwords go in the Vault.
+username: 'kdam0'
+
+# This is pretty much only used for the ZFS install step.
+# sbc: Currently supported ones are:
+  # - Rockchip: rockchip64
+# If you don't care about installing ZFS from here, leave this blank.
+hardware: 'rockchip64'
+
 # the wildcard domain under which all apps will be hosted.
 apps_domain: 'kumardamani.net'
 
-# list all the app configs you want to host here.
+# list of all the apps you want to run behind nginx.
 # port: the host port that this service will be available on.
 # access_domain: external (nginx) domain.
 #   Only include when applicable.
@@ -52,6 +64,16 @@ apps_conf_map:
     port: 31907
     status_endpoint: '/system/status'
     curl_requires_auth: false
+  photoprism:
+    port: 31908
+    access_domain: 'photos.{{ apps_domain }}'
+    status_endpoint: ''
+    curl_requires_auth: false
+  # adguard:
+  #   port: 31909
+  #   access_domain: 'adguard.{{ apps_domain }}'
+  #   status_endpoint: ''
+  #   curl_requires_auth: false
 
 # list all static websites you plan to host here.
 # name: the root domain name of the static website.
diff --git a/group_vars/all/vault b/group_vars/all/vault
index b7497af..328c155 100644
--- a/group_vars/all/vault
+++ b/group_vars/all/vault
@@ -1,28 +1,34 @@
 $ANSIBLE_VAULT;1.1;AES256
-63336336613233616539616164616433666436353761376139336663613032323161616536336332
-3963653737353730383561343463623437353230376561350a633133373035393636363762643066
-30613830346231326161666661643065316439323632633434633836326136303339386236386561
-6462346562313464300a633266363066383138396333656338656432633465353365316635613337
-66336532643561363230346164343636663331333436383536653339306332343731386430636262
-33333638333565306331363866343763353434613230646631386234393762366236343633653431
-33613133623664646135616439616165366531303565616439326330646335326536396634316165
-63656431613766643434383565666262356261373937313961376538353037306236653730643564
-35613564393762366335303532366338393930613936383137363435633331323635383837663864
-32663866366131303263636162303837643161306433346433353361616263376265613934653934
-33336161626137343432633561313631396262626665356633343561636133386630323466383636
-34636434396464386265326638303730656166353663343561313737353130333635356337623639
-35373562613765346339303066323136386139326230633732653437623239386132376165386634
-32613162323931346238303334616137356264326663613362366664396162393033343664306663
-34656435316430373534646636653662303962396130323365643966666461613861343131656633
-32666432616238326338613862623638386338303030323365666237616162306133656136623633
-36343964656333663665373062386664626438303866643533303961346431376331373436376339
-31333131363762316563626164356236343862373533633839666133343337653237343730313965
-64333633336630653935636436323132643861666338613631323433353764306266326333653436
-30333661333834323262366464656166373066343035343335636332346561656463616266333866
-39383464343837656562666565393434663363316639323032333330383334616638393463653863
-37643162626335376666666336633339386434633532343765653334333033393830666630656633
-64383730666662363331663965656139336638343532663030343362623134376661313539313132
-30646437616134616538396464636361646435633130333137386332643931303234653738343531
-63363063333233376334326538393233366436353230613430326562643632313738356333383430
-61343262346531656537313965626532656664396139386331623362333538353561303465303466
-616362393632643064653731333335383438
+61373432623236353766373265633331353163393733366637363333383935386137336464313864
+6165363331303839363837396331353866373264376464660a363364666661613738336536333138
+37383833663765366135366139323531353966663333313938636163643636666638383863353265
+6638363065323261350a343063343932633066313962323763623366333232316262383662393562
+63656138336339373431333033643264393937306137356466343161396362353537323363643834
+64326264326665636633636361386336316235386433326536613263666234363932323766316538
+64306362353236316334653839303636373963343434303435343132326638613162323334663232
+37663932646132613935333030386633343833323532343864616136393737303864343139643366
+61316666346439613762376534663162643030356630646661623037643063306632343861636336
+31663435323362663163616335383264656534363739366461373239396337623234616164366239
+63306530616163633735633062666134393430633733333235373134663763666637323930346130
+66373663653734356665313464633966313835303838323266613331313535353064663431396133
+65616135376163653532356438313331396138653164356362313633633935623435383430663538
+32316162643436333933343537373233343731383164363634373964653537613265633934643235
+65656636643133333735346164373862383161363061306638363763363333653562653334323536
+62323066653462346362323737626436303966393932633132636264623032633530653763636434
+33393966306436396564356563666635666630626661313762336134643232646631353234393864
+63613165396362643963303632636531653939333134363032313533663735613337386236313034
+62653139633861383662356530396638333837613338666563343835346236653036313964643330
+30353063356636643331396635633438313335396133356431613232326630363864393939663962
+38313861356163646665346163613932626662623636333165386535613863363264613666636432
+39326665323563613033663930636631616264626236656265616337383737616466643530653463
+63346538316231313365373866373430623131366561326137653535663437623935626636636338
+38303463666639646166323834353334383831376465363532616330313737393262656666393566
+65336239653861313433386661636339356532623862306238653366373531333833323237623731
+63356466323637343830356164393833323633343234376262313564613861303535613864336531
+37643536333339633366363264303638316266316163343039376537373634626361393163326565
+65373539643461383066306363313165616435633836363336313336396666336232626136636331
+34623434343431646134353734373733343338346432343333316132366566633861373934326434
+65333130633463626364386561636232383138313632626639653063303163646137323336396635
+61363066663465613731373936663337666563616662626234643239396335376363393431306638
+36323665633236376465663662643230313564386561386462326337323533613762663435363763
+33383135636437353363313030663561393235363366323030383166393939333332
diff --git a/group_vars/all/vault.example b/group_vars/all/vault.example
index 8ca22bf..e053dda 100644
--- a/group_vars/all/vault.example
+++ b/group_vars/all/vault.example
@@ -1,5 +1,7 @@
 ---
 
+vault_user_password: ''
+
 vault_wireguard_server_priv_key: ''
 
 vault_ddclient_user: ''
@@ -18,3 +20,6 @@ vault_searxng_secret_key: ''
 vault_transmission_user: ''
 vault_transmission_password: ''
 
+vault_photoprism_admin_password: ''
+
+vault_plex_claim: ''