diff --git a/host_vars/10.11.12.35/vars b/host_vars/10.11.12.35/vars index 1369f99..165dce7 100644 --- a/host_vars/10.11.12.35/vars +++ b/host_vars/10.11.12.35/vars @@ -2,9 +2,8 @@ hostname: "{{ vault_hostname }}" domain: "{{ vault_domain }}" -user: - name: '{{ vault_user_name }}' - password: '{{ vault_user_password }}' +system_user_name: '{{ vault_system_user_name }}' +system_user_password: '{{ vault_system_user_password }}' admin_mail: '{{ vault_admin_mail }}' sender_address: '{{ vault_sender_address }}' @@ -67,4 +66,4 @@ WIKI_JS_DB_HOST: '{{ vault_WIKI_JS_DB_HOST }}' WIKI_JS_DB_PORT: '{{ vault_WIKI_JS_DB_PORT }}' WIKI_JS_POSTGRES_DB: '{{ vault_WIKI_JS_POSTGRES_DB }}' WIKI_JS_POSTGRES_USER: '{{ vault_WIKI_JS_POSTGRES_USER }}' -WIKI_JS_POSTGRES_PASS: '{{ vault_WIKI_JS_POSTGRES_PASS }}' \ No newline at end of file +WIKI_JS_POSTGRES_PASS: '{{ vault_WIKI_JS_POSTGRES_PASS }}' diff --git a/host_vars/10.11.12.35/vault b/host_vars/10.11.12.35/vault index 9d0d6e5..a8a0c5f 100644 --- a/host_vars/10.11.12.35/vault +++ b/host_vars/10.11.12.35/vault @@ -1,96 +1,97 @@ $ANSIBLE_VAULT;1.1;AES256 -36336162633434623330663764366462646230663364323631333266623462343762633439353966 -3066383131336437333531363539353263653666393338390a303936393633323163633434616337 -38336362633733636436383335623735383833376262383964643439626437343836346363633466 -6365306665623932350a633439323964306263363432643039383436353538306131356263346332 -61633864393235353265626634636138666535646430326464616231643063333532356664363563 -31653161643762316534376333303362383064636637313366393464386339386630373365613863 -34343964343932393335653337356263656333363466306330323536336430653632356436666163 -37336632623238383030623564353738306165326435363930336362616638376562383831343034 -35343061633038333062326630386137663261633366633466623961326333393338343636376563 -32386165386530346637656638333239393664653330336233623837656362613037633737383536 -31323635653264646239306337656437656138653338353665333533326562396131313031653264 -39656539646638646135333031323032663162643066343032306130333935363266656164663431 -33646662373561353161616633313939626639366232616465643831316365303361636561393065 -30353236313437333531636235353333663231303735636638353235653965626563386162663066 -38363766363566343030306234373434623462393538663531633435333337653632393331336432 -31346466616666663638623665316165386137396131646564363863323066396239333333313539 -66656366313035646338613332303538343439343561396338383166636131663061646265313937 -66363932313233626561663364346633633662396537313663393833393937656636386633663034 -30653334316134393739616335303361356164383134376362343664626438613937623830623332 -31663637303635336436623161663833653338626530373061366131613139353963353932623564 -39613066623835636130386664303230373936336439643032653831353039356135633439653737 -39393263383234656637646438383364656534353637623338633065353561656366393432396138 -66333231323266666165383932616661346163613338633537383866386438656637646465343166 -34346531303330643738313562383935643534633566333533653434333132653232626632336565 -62636634623962346330346238316364316364376135303432323863646333346634353566363138 -33393966363638653135616338316331393065646466343536363865353362373932643730663232 -33353232343431363832323833376663336539306265656632316466343165646137326261363831 -34356365336465633135623865366566356162313166393230333166306433306238353438616463 -31636666653138333235326163656366633337396630366137623430633332316561343661646530 -38383964353266643363643563333535316335343065626337646462613037626636306231656366 -30346631356433376665343961316139373032613839316361656161633035323039646536353030 -37666362363839326661316362303035626430666462633066646532396564386166313966363736 -64316465393634616431363234376162323564643837653537343764613639626339326637623934 -33363363623661356539663736393836653132313461316662366639623437373664313832373836 -33356337616232373462653865636264323565663233633737386464613738623664633863623036 -34343665396130353066663534383964626565303234626564306431396638333639306131613631 -61653039666139373466306165373937366336313235393838333738303434396632353536363532 -32366662353562303066376334656264633837653936323834623038396566313936323261356133 -62643564643232616639646633643439666361333339356433633135666665623930323638306366 -30653934633330383561366664666366326533336366356162643636663330656531366164373763 -38366466316230343764303566323736643763643062393461316232383532333264323863626338 -65646562376236326533353832323131303233623739373038643430653963653532323935623130 -38306366343037323566346366343430393634333630653535633039623466353539346261626530 -66393362353634343935363263313333666266653039313632646330333063663762326537326331 -37656534313637666439356432323961376233326162393832323935323761616530303233633864 -31623133366366626236316130336164623533633432363236343931646563396465646631653463 -37313537363739323936663861366665333533333763643664323561663063303532386530393133 -66353162386232353032376433343131376635373130396561306239373562633334343630306165 -36663661376133653365366162343431623737613639353637623065663638366334313737643237 -35623033613839633635313530653734626465396632333462396164333232336433666663623739 -38386565383630613234363435653531616535636366316538363661303336663461613564333439 -62323062313837326365373664633036646533656231323062656462373262363863626434663062 -62346337643262323364633332613836336333353061646335326164623433376639646533376565 -38333330386336396361303435626362393735303039376561356634363661666561646630323234 -33376662346262633633333664616130613466343235396633616536663336656165353065313434 -62336632376564636534633132633163666234663232373432613336343930326334303661613261 -62313837626265646630333230643439383131636661366339626662383866333664333266633130 -64623162383737663961303938626533643330353835636231663131646663336163353939363938 -32646364346337323939383461633131656537353532636231333832356161356561383535613130 -39306564613166643338353034366534316233306631333062613737393530663466313235626662 -62313838623161643433366564376337393937626637356232343662663435613037393436653130 -34663063613635633036353564653832643237353538616238376436333339623536626462306263 -38393537303730646634396365363865363931613538326132376562313438326661613161373532 -35623835363432333634353437633831626330343864626530393437316237663034666133613431 -64646336313764623361353338333763633062623162373163353161313230643836383164633235 -66656266323939346465313433356438663537663361366561393137316534323036626536313165 -39623136623931373034353038343030303830393336643163336433633633653664343932653135 -62323939666363623963666138343734333363303435343339616665643562353861646532356433 -62313065373965663461363164346663653634343833323163616362383863306630356334653030 -36646535316336626532323131636131363766646663623065346565313432656130636337623837 -32616533363764383538313263383332623562353535393064663863303932343034306463393135 -37323362376364356638323563383135316264616239366165666461623663653564386461373731 -39323363343130353537363831623663386466333163656365373764343230663132633564356334 -32396632336238623837363766316464653866336134653137353832333031376562356536316666 -30623630373665336536333431666361336532613937313566373965663566393962613633326663 -66663363336136373836636331373639343431366437333434623336623130336435623932353637 -63353763343035363066353835633063633934616334643463336235336531623839376166333263 -33363238646131386666663365633433643030313937333662326461393532636262633061633437 -64626531303037313165656634653235363862303964313835613863633865613037363436636664 -61323133313866656536356338346136313131396139363234613234393237646634376133653633 -66623561663534323630323064373839313462646363326639666236383839643062613463333434 -64373662376430613632313866616339663838313931616231346535653739386462323761373036 -37636531353536653939643335656666333165653130623833616534323364616336626637346365 -32396665323966623335323637666331646336313337303362363739643864386235363464336532 -38623736626337653462306530353536393732386565653432656631636462663032623839323730 -62653464326632393736616436316535333133653033316234626432343336323231613964646664 -39656165333763393361393263643063633932313530666338316335616434383730383934393661 -32633131343264653039366539333930653563366431646265383630373730353038373032383338 -39373661666134653738653632343430663636656162373631336635633136393934623663323131 -39616439623964326466663232343231616631323362333966346530303065303936383938343036 -34366662656134383864313261646238363736343837373162303163323230326361653937346266 -30666431666335616336626636353262613661366137333933656338363736653031346335313238 -36306633633362646638303730393534306330386439643033313430393334386165613439353764 -30323563666466333530366666313962303830333339636630656230666266313063643564623735 -393336336234666665663931316362656337 +62653035316539353664313762363837323335323563376263653833316136383736386365636338 +3963376566386137643232653135356664333263663932340a393764343833366139396139316663 +64336533616337613334353933643932306565393934616633653239633232363737636339343730 +6461613834663431310a356564356237373066666239353261653336303839633166343461646266 +38373132326361626339653338626539633961666331663839393763633831373865303266663734 +61323861323133373938633238353430323031663038396664326264343762666333333463336164 +37656330353934346662643234353163386430633531656537353166353431356339353231633732 +36666161623732383663646161343331363262373732643439623962396564333339623237623862 +32643939623766313730353761306436646334373230393331643264343336376566336361333435 +64363566386264373534313131313061313066616133323862613062623865316662656639303137 +39306466623061663062666135393363353234623032323336303164383761363636356232626561 +62363961313932373236363637623336316561393235313235363465623438613330326566373934 +63666235386263643631373562656537343634616139616564313061643837343532666165336662 +35333861383064323534346130663330613966303665376263636435333037643433636330626432 +30323235396234353461343633666366623130633332386135626636376232633939353939383536 +36346264333333393030633430396338656334613433336331353562376563363765343839633030 +37373030613830366362633062626430303734643066646462653634633935363163636230343835 +35306235636236663663623264646437323664643839393235333966633263366132353465353131 +35663361323338386132633439623836643636396230636630663139306331353030363331316437 +32663836633031653937333236616330666561626638313735343936666238646264343066626661 +36616466336434333164613438373638656538343961383138313266623132643337376662636636 +32633664353030396639386330336337386265633139363230633161346635656537616663616565 +35393236353633303137336162323164616366616632306237643138346637376637356465343739 +65643332346637333661623136646261613165623865313062636430343333616634386364343839 +32356536333764303966333431333761613035326163653836313361303036616531663136663630 +63313734633339613135306364643837323039396331646434303836386265663433373638383334 +30303834656435346239663839616135383862373463643432336134303662366334333938366435 +38613738363532633732343439653933656335636465666636376232303834663538633731633061 +35653339303630326134633664346436363063653665643363323431636132636663643632313561 +39386531616132653763326164633639653463353239333165326165653837326565633363663438 +35386530393362346630626333633362303631353036396630383337316565333538333736636566 +38633966363664666634353461326463346364333066663438333966303434646562376362333465 +64363934383434626332393136343862646166333234376332333962313262666534363838613163 +37663964633439326531663231316137653263636136633162653465623666343261336661316361 +35616434373038366432643665373262623331326266643036663461326465386265326463653565 +38373464323764646662396639636437636334376237663236663436323631353839366430306631 +65313861306362373835376336643339663539663334346138366166626434323737346630663864 +66623364666361656461383336366364626536616234636535366266353866303436393965626464 +37613466376563313262636463383939643037353637393736303034343434356538336136303334 +66326433643438306235316366313264336132663064623632356562363365636537306162653336 +61336437316663373661623836643030393738376361316539323633663838396638346264386336 +63326362326531303465336237306462616363363264396137623430386139356433313331666261 +38316230303065396662383530653565363562343162613666393265643961326336303737643030 +32353534646531646164393933366431643937396635336235383734343730626635663462356135 +64353062353830626264313431613861373264353831353363346265383062333838323430386336 +30316431353838663835366337346136333836303263303964343632623064666338613537333532 +37653937646538666565386135336330336333396162396265346231383162343230356536393765 +31333865343737626233316365333737653239663562623931646331646235383062656334643463 +37666434646536656466636330633933323861666565396134303866663530636633303638386631 +31343638336564343737633765643038343366663230633934366330373338383834303364366166 +37636466653930376562366233616238333061616538376439383261653838333561306536623131 +30373963373963313364336330336330656236663332656236656435306137333165306635396530 +34616665653236313336363538633365313362633064333863633765633634643839623735376335 +64626434323966386564363765383937356135646234353664613934313864626134653233653865 +31393132316337393766663131643735643961303539653537306564656537333538376439316661 +30393633343636366565663634366138313736343163326132656266343562306430656332303562 +63643432323232353466373932343961313438303963326262383432376538666361333735396239 +33373330663037383135323836326265373335363665666139303266646162363234363636383862 +31336132323964356434336537333035663263336262386237383334393734663231613733626562 +65333231333766613662653036623462633362393030356535323661646265326666353838373562 +31636663626336323031623364616363343165356138623761366633336563343033646433643435 +31306230316163383061646365643230373831316332653637366438643965326266663961303564 +37316165653732636564616465653635383930313635353333336332616231636666393936656437 +39336631653061373036353161646532653834393633353331656531653236326539303861653163 +30323730343461316466646164666262633139393331623365626436623032323865396462356134 +37303564666637303537363831333932346466313661356537653162333965346635616233373936 +35363433376434343731636638323938313262656334386161353633333865636333646434303039 +39393137663962393230326163373866326463323536313237316362643834656437666262393230 +31343636366665366530306434633065316630393162613962656536656665643562333362343830 +61346635313232383765343562383037643364343831316665653465343239363330353737333634 +39666334653233653130303662353630383634616262323033646134343130386334633162643038 +62626435393561363636396362356530623335333939353631633534623030343836353934323361 +61656135366132313966626363386239313462356434333237326530306639393934663264333130 +64616435623166636135326630363734306530333236373634333832323164333535643033396538 +63313264303337643564303933623562356165636432616236313139656461613463663534343130 +30353335323837656563343937393736356339633865666433323061623935616133373363656133 +39336136336339353635653431306266353037616166356462323765333866363961353637333038 +61373335393238373962386465623331396430353930623236623561636564303861366366373330 +62373733313330663764656138633530633331623436333437613037303966636136396339366265 +31363963633934633931306166343861623165626136613363613939343066323532393235373065 +39626630616439666534373166393739643038326431646530396563626335396463383565363530 +37383730623466323061353539663065633934333061643034313738363634646564646635666438 +31373635333163306130336434353935373832383961306133383334366564653734646562616262 +36663964306537383936346234633838393439656135666266633535633237653863373830633930 +62636335363765393134333639376430623531666265623562323532343362656235626465616665 +38303339633936343265326564626536383261343731643935393733356239313038616433626534 +38643334376339633761386663343962616532656538323265633662633236613861343630343536 +38383936383464353266316661323438323764356261363933336430303932393633326138663461 +61666634306239323336656466616261336135366139396361326466633439313466663462356463 +32623333623331303861333437656166336233303336333636346365323936363734393834306230 +65356333626261313232396530336364376263616333363134383166393164633262343837343738 +36656464653832303564356464396136393237313566656638376565646662613765613934393735 +66346434303038613066303336383636636462636532313962376639323335646536646134336366 +36333965666531613732346636663536653532663232393937356165306535346266303233316537 +30633135316334343838663035343465326663323465613632356234663037326139366430383864 +65363530376436613531 diff --git a/host_vars/host-ip b/host_vars/host-ip deleted file mode 100644 index 5ade529..0000000 --- a/host_vars/host-ip +++ /dev/null @@ -1,17 +0,0 @@ -hostname: '' -domain: '' - -user: - name: '' - password: '' - -admin_mail: '' - -relay: - server: '' - port: '587' - user: '' - password: '' - -backup_via_samba: false -backup_via_nfs: true diff --git a/hosts.yml b/hosts.yml index a6dbba6..8c60cf4 100644 --- a/hosts.yml +++ b/hosts.yml @@ -2,12 +2,10 @@ all: hosts: 10.11.12.35: - 10.11.12.250: children: docker_hosts: hosts: 10.11.12.35: - 10.11.12.250: npm_hosts: hosts: 10.11.12.35: diff --git a/roles/audiobookshelf/tasks/main.yml b/roles/audiobookshelf/tasks/main.yml index de52982..539509f 100644 --- a/roles/audiobookshelf/tasks/main.yml +++ b/roles/audiobookshelf/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create Audiobookshelf directories if it does not exist become: false ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/audiobookshelf/{{ item }} + path: /home/{{ system_user_name }}/docker/audiobookshelf/{{ item }} state: directory mode: '0755' loop: '{{ audiobookshelf_folder }}' @@ -22,9 +22,9 @@ - '11002:80' env: volumes: - - /home/{{ user['name'] }}/docker/audiobookshelf/data/audiobooks:/audiobooks - - /home/{{ user['name'] }}/docker/audiobookshelf/data/podcasts:/podcasts - - /home/{{ user['name'] }}/docker/audiobookshelf/config:/config - - /home/{{ user['name'] }}/docker/audiobookshelf/metadata:/metadata + - /home/{{ system_user_name }}/docker/audiobookshelf/data/audiobooks:/audiobooks + - /home/{{ system_user_name }}/docker/audiobookshelf/data/podcasts:/podcasts + - /home/{{ system_user_name }}/docker/audiobookshelf/config:/config + - /home/{{ system_user_name }}/docker/audiobookshelf/metadata:/metadata networks: - name: proxy \ No newline at end of file diff --git a/roles/borgbackup/tasks/main.yml b/roles/borgbackup/tasks/main.yml index 20f6be8..37c8e3f 100644 --- a/roles/borgbackup/tasks/main.yml +++ b/roles/borgbackup/tasks/main.yml @@ -9,9 +9,9 @@ - name: Copy smb credentials file ansible.builtin.template: src: "../templates/cifs.j2" - dest: "/home/{{ user['name'] }}/.cifs" - owner: "{{ user['name'] }}" - group: "{{ user['name'] }}" + dest: "/home/{{ system_user_name }}/.cifs" + owner: "{{ system_user_name }}" + group: "{{ system_user_name }}" mode: '0600' when: backup_via_samba == true @@ -19,15 +19,15 @@ ansible.builtin.template: src: "../templates/backup_to_smb.sh" dest: /usr/local/bin/ - owner: "{{ user['name'] }}" - group: "{{ user['name'] }}" + owner: "{{ system_user_name }}" + group: "{{ system_user_name }}" mode: '0700' when: backup_via_samba == true - name: add cron backupjob for backups to samba server become: true ansible.builtin.cron: - user: "{{ user['name'] }}" + user: "{{ system_user_name }}" name: "borgbackup the docker dir to smb share" minute: "30" hour: "3" @@ -40,8 +40,8 @@ ansible.builtin.template: src: "../templates/backup_to_nfs.sh" dest: /usr/local/bin/ - owner: "{{ user['name'] }}" - group: "{{ user['name'] }}" + owner: "{{ system_user_name }}" + group: "{{ system_user_name }}" mode: '0700' when: backup_via_nfs == true @@ -49,7 +49,7 @@ - name: add cron backupjob for backups to NFS server become: true ansible.builtin.cron: - user: "{{ user['name'] }}" + user: "{{ system_user_name }}" name: "borgbackup the docker dir to nfs share" minute: "30" hour: "4" diff --git a/roles/borgbackup/templates/backup_to_nfs.sh b/roles/borgbackup/templates/backup_to_nfs.sh index d39ab73..6527b6e 100644 --- a/roles/borgbackup/templates/backup_to_nfs.sh +++ b/roles/borgbackup/templates/backup_to_nfs.sh @@ -1,7 +1,7 @@ #!/bin/bash # Variablen -data_dir="/home/{{ user['name'] }}/docker" +data_dir="/home/{{ system_user_name }}/docker" nfs_share="{{ nfs_share }}" backup_target_usage_threshold="{{nfs_threshold}}" # Prozentuale Schwellenwert für die Speicherauslastung mount_point="{{ mount_point }}" diff --git a/roles/borgbackup/templates/backup_to_smb.sh b/roles/borgbackup/templates/backup_to_smb.sh index 77d5bc6..15b5ccc 100644 --- a/roles/borgbackup/templates/backup_to_smb.sh +++ b/roles/borgbackup/templates/backup_to_smb.sh @@ -1,9 +1,9 @@ #!/bin/bash # Variablen -data_dir="/home/{{ user['name'] }}/docker" +data_dir="/home/{{ system_user_name }}/docker" samba_share="{{ smb_share }}" -samba_credentials="/home/{{ user['name'] }}/.cifs" +samba_credentials="/home/{{ system_user_name }}/.cifs" backup_target_usage_threshold="{{smb_threshold}}" # Prozentuale Schwellenwert für die Speicherauslastung mount_point="{{ mount_point }}" backup_repository="$mount_point/{{borg_repo}}" diff --git a/roles/defaults/tasks/main.yml b/roles/defaults/tasks/main.yml index ae76ff3..7809180 100644 --- a/roles/defaults/tasks/main.yml +++ b/roles/defaults/tasks/main.yml @@ -6,15 +6,15 @@ name: - sudo -- name: Add user "{{ user['name'] }}" +- name: Add user "{{ system_user_name }}" ansible.builtin.user: - name: "{{ user['name'] }}" - password: "{{ user['password'] }}" + name: "{{ system_user_name }}" + password: "{{ system_user_password }}" shell: /bin/bash -- name: Add user "{{ user['name'] }}" to sudo group +- name: Add user "{{ system_user_name }}" and join sudo group ansible.builtin.user: - name: "{{ user['name'] }}" + user: '{{ system_user_name }}' groups: sudo append: yes diff --git a/roles/defaults/tasks/ssh-config.yml b/roles/defaults/tasks/ssh-config.yml index 9eebd2a..dc21208 100644 --- a/roles/defaults/tasks/ssh-config.yml +++ b/roles/defaults/tasks/ssh-config.yml @@ -1,7 +1,7 @@ --- - name: Add Authorized Keys ansible.posix.authorized_key: - user: "{{ user['name'] }}" + user: "{{ system_user_name }}" state: present key: "{{ lookup('file', 'key.pub') }}" diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 5868a27..e45d61d 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -36,9 +36,9 @@ name: docker state: present -- name: Add user to group docker | "{{ user['name'] }}" +- name: Add user to group docker | "{{ system_user_name }}" ansible.builtin.user: - name: "{{ user['name'] }}" + name: "{{ system_user_name }}" groups: - docker append: true @@ -57,6 +57,6 @@ - name: Create docker dir if it does not exist become: false ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/ + path: /home/{{ system_user_name }}/docker/ state: directory mode: '0755' \ No newline at end of file diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml index 96e6848..9c45cdb 100644 --- a/roles/gitea/tasks/main.yml +++ b/roles/gitea/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create gitea directories they do not exist become: true ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/gitea/{{ item }} + path: /home/{{ system_user_name }}/docker/gitea/{{ item }} state: directory mode: '0755' loop: '{{ gitea_folder }}' @@ -27,7 +27,7 @@ MYSQL_PASSWORD: "{{ GITEA_DB_PASS | string }}" MYSQL_DATABASE: "{{ GITEA_DB_NAME | string }}" volumes: - - /home/{{ user['name'] }}/docker/gitea/db:/var/lib/mysql + - /home/{{ system_user_name }}/docker/gitea/db:/var/lib/mysql networks: - name: gitea_internal @@ -49,7 +49,7 @@ GITEA__database__PASSWD: "{{ GITEA_DB_PASS | string }}" LOCAL_ROOT_URL: "{{ GITEA_ROOT_URL | string }}" volumes: - - /home/{{ user['name'] }}/docker/gitea/data:/data + - /home/{{ system_user_name }}/docker/gitea/data:/data networks: - name: gitea_internal - name: proxy diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 7820c89..4b05ce5 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create Nextcloud directories if they do not exist become: false ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/nextcloud/{{ item }} + path: /home/{{ system_user_name }}/docker/nextcloud/{{ item }} state: directory mode: '0755' loop: '{{ nextcloud_folder }}' @@ -27,7 +27,7 @@ MYSQL_USER: "{{ NEXTCLOUD_MYSQL_USER | string }}" MYSQL_PASSWORD: "{{ NEXTCLOUD_MYSQL_PASS | string }}" volumes: - - /home/{{ user['name'] }}/docker/nextcloud/db:/var/lib/mysql + - /home/{{ system_user_name }}/docker/nextcloud/db:/var/lib/mysql networks: - name: nextcloud_internal @@ -38,7 +38,7 @@ state: started restart_policy: unless-stopped volumes: - - /home/{{ user['name'] }}/docker/nextcloud/redis:/var/lib/redis + - /home/{{ system_user_name }}/docker/nextcloud/redis:/var/lib/redis networks: - name: nextcloud_internal @@ -60,7 +60,7 @@ REDIS_HOST: nextcloud_redis volumes: - - /home/{{ user['name'] }}/docker/nextcloud/data:/var/www/html + - /home/{{ system_user_name }}/docker/nextcloud/data:/var/www/html networks: - name: nextcloud_internal - name: proxy diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml index 71c9da0..4b3d44b 100644 --- a/roles/npm/tasks/main.yml +++ b/roles/npm/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create NPM directories if it does not exist become: false ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/npm/{{ item }} + path: /home/{{ system_user_name }}/docker/npm/{{ item }} state: directory mode: '0755' loop: '{{ npm_folder }}' @@ -27,7 +27,7 @@ MYSQL_USER: "{{ NPM_MYSQL_USER | string }}" MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}" volumes: - - /home/{{ user['name'] }}/docker/npm/db:/var/lib/mysql + - /home/{{ system_user_name }}/docker/npm/db:/var/lib/mysql networks: - name: npm_internal @@ -49,8 +49,8 @@ DB_MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}" DB_MYSQL_NAME: "{{ NPM_MYSQL_DB | string }}" volumes: - - /home/{{ user['name'] }}/docker/npm/data:/data - - /home/{{ user['name'] }}/docker/npm/letsencrypt:/etc/letsencrypt + - /home/{{ system_user_name }}/docker/npm/data:/data + - /home/{{ system_user_name }}/docker/npm/letsencrypt:/etc/letsencrypt networks: - name: npm_internal - name: proxy diff --git a/roles/vaultwarden/tasks/main.yml b/roles/vaultwarden/tasks/main.yml index 420305e..ba54e61 100644 --- a/roles/vaultwarden/tasks/main.yml +++ b/roles/vaultwarden/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create Vaultwarden directories if it does not exist become: false ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/vaultwarden/{{ item }} + path: /home/{{ system_user_name }}/docker/vaultwarden/{{ item }} state: directory mode: '0755' loop: '{{ vaultwarden_folder }}' @@ -25,6 +25,6 @@ SIGNUPS_ALLOWED: "{{ VW_SIGNUPS_ALLOWED | string }}" # ADMIN_TOKEN=${ADMIN_TOKEN}: "{{ VW_ADMIN_TOKEN | string }}" volumes: - - /home/{{ user['name'] }}/docker/vaultwarden/data:/data + - /home/{{ system_user_name }}/docker/vaultwarden/data:/data networks: - name: proxy \ No newline at end of file diff --git a/roles/wiki_js/tasks/main.yml b/roles/wiki_js/tasks/main.yml index cc32e0d..b8679b4 100644 --- a/roles/wiki_js/tasks/main.yml +++ b/roles/wiki_js/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create Wiki_JS directories they do not exist become: true ansible.builtin.file: - path: /home/{{ user['name'] }}/docker/wiki_js/{{ item }} + path: /home/{{ system_user_name }}/docker/wiki_js/{{ item }} state: directory mode: '0755' loop: '{{ wiki_js_folder }}' @@ -26,7 +26,7 @@ POSTGRES_USER: "{{ WIKI_JS_POSTGRES_USER | string }}" POSTGRES_PASSWORD: "{{ WIKI_JS_POSTGRES_PASS | string }}" volumes: - - /home/{{ user['name'] }}/docker/wiki_js/db:/var/lib/postgresql/data + - /home/{{ system_user_name }}/docker/wiki_js/db:/var/lib/postgresql/data networks: - name: wiki_js_internal