diff --git a/.gitmodules b/.gitmodules index 99d8158..7b4baee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -147,3 +147,6 @@ [submodule "collections/ansible_collections/l3d/users"] path = collections/ansible_collections/l3d/users url = https://github.com/ansible-actions/ansible_collection_users.git +[submodule "roles/l3d.rustdesk"] + path = roles/l3d.rustdesk + url = https://github.com/roles-ansible/ansible_role_rustdesk.git diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 6088e2d..001292c 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 6088e2dc0fdd22cdf05dfeebb4ed4897abfc413f +Subproject commit 001292c780adc53e175470dee3ad6b138956bd56 diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git index f62d67f..8819b2d 160000 --- a/collections/ansible_collections/l3d/git +++ b/collections/ansible_collections/l3d/git @@ -1 +1 @@ -Subproject commit f62d67fb66138593d2f999b0e7e68282f9871e5b +Subproject commit 8819b2d479a96fe30baa1d187823a98c80f5cd02 diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users index 3456ee7..22551c7 160000 --- a/collections/ansible_collections/l3d/users +++ b/collections/ansible_collections/l3d/users @@ -1 +1 @@ -Subproject commit 3456ee756e4ca90768493d8021f985e59c0a6611 +Subproject commit 22551c7eb958c834a739285bd67c9c9d63188d1c diff --git a/host_vars/mail01.l3d.space/vars.yml b/host_vars/mail01.l3d.space/vars.yml index af34209..d700f42 100644 --- a/host_vars/mail01.l3d.space/vars.yml +++ b/host_vars/mail01.l3d.space/vars.yml @@ -1,31 +1,13 @@ --- -users: - l3d: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - weechat: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - mailwebuser: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - -accounts: - - l3d - - mailwebuser - - weechat +l3d_users__local_users: + - name: 'weechat' + state: 'present' + admin: false + pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}" + - name: 'mailwebuser' + state: 'present' + admin: false + pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}" # mail domains additional_dns_maildomains: 'mail.l3d.space imap.l3d.space smtp.l3d.space' diff --git a/host_vars/mx.l3d.ch/vars.yml b/host_vars/mx.l3d.ch/vars.yml index b69af99..d653408 100644 --- a/host_vars/mx.l3d.ch/vars.yml +++ b/host_vars/mx.l3d.ch/vars.yml @@ -1,33 +1,19 @@ --- -users: - l3d: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - mxusr: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - -accounts: - - l3d - - mxusr +l3d_users__local_users: + - name: 'mxusr' + state: 'present' + admin: false + pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}" acme_domain_unwant_list: [] # - name: 'example.com' nginx_sites: - - name: 'mx.l3d.space' + - name: 'mx.l3d.ch' webroot: user: 'mxusr' - - name: 'node-exporter.mx.l3d.space' - - name: 'nginx-exporter.mx.l3d.space' + - name: 'node-exporter.mx.l3d.ch' + - name: 'nginx-exporter.mx.l3d.ch' # letsencrypt acme_notification_email: "{{ _acme_notification_email }}" diff --git a/host_vars/services.l3d.ch/vars.yml b/host_vars/services.l3d.ch/vars.yml index 9f74fa2..d28b733 100644 --- a/host_vars/services.l3d.ch/vars.yml +++ b/host_vars/services.l3d.ch/vars.yml @@ -9,11 +9,11 @@ acme_domain_unwant_list: [] # - name: 'example.com' nginx_sites: - - name: 'mx.l3d.space' + - name: 'services.l3d.ch' webroot: user: 'mxusr' - - name: 'node-exporter.mx.l3d.space' - - name: 'nginx-exporter.mx.l3d.space' + - name: 'node-exporter.services.l3d.ch' + - name: 'nginx-exporter.services.l3d.ch' # letsencrypt acme_notification_email: "{{ _acme_notification_email }}" @@ -36,8 +36,6 @@ firewall_allowed_tcp_ports: # - "4190" # - "42023" -nginx__infrastructure_domain__enabled: false - # l3d.time.ntp ntp_statistics: true diff --git a/host_vars/services.l3d.ch/vault.yml b/host_vars/services.l3d.ch/vault.yml index 82fd91b..ffaf78d 100644 --- a/host_vars/services.l3d.ch/vault.yml +++ b/host_vars/services.l3d.ch/vault.yml @@ -1,16 +1,89 @@ $ANSIBLE_VAULT;1.1;AES256 -63656237376635396638613937623136656236383833663266356330663365303339636139386332 -6530326534316231323333666434353866376461613066640a653333333037396132646637346362 -36383761313731353532666632353561306233663139316532393764396431373036626361663830 -3334373338663333370a343562376530373461663636306135313864626638343631303036616165 -38386166316432663866383865383834383135646530303739383562616439363137623430373732 -34376566616266613664313034306461343863383132633631316135383239343635653034343362 -63656331396135646238623138323438366532636364613865323066623666303531626632393031 -36373163656539376262363962633234393936306438663836383431643461623533363939333566 -66336636353462336338663937303039303734383937393135653737666638633935313335303935 -66323836663634633532616537656533663236663465343862346562396263366335343535396266 -33376362343362643237363664623836346366623539323863323162366364383034393066393930 -62326133653630346132323563636261383631323931333638633233353835636235306334323631 -31386164326435353639396263376439363130663331356364646266336330646466353862656532 -61623839366439343266643833373563393163306466303863333932336566666265613666383063 -393632663233343964353161346639616332 +30303965353563623236636538343366633132363838316264636361626461643431323862316562 +3963343432363065353339316263383236613262656335660a316461373938613031633535616462 +31386436343035646363353334386264313637356637373762306435376530653333643530356566 +6238666437303764620a303237636163346565613935303765313436336430356566306164666434 +66333136633661636366613437666236333432366663643561656535346631323063643133336334 +30333535356137356162636333613338366439343030306234333461633862356237373234383934 +35663363383439653565363661313861646136333966323237353134386431376137373432353464 +63613731353736656635656233663435643931613564346231373166643763316637376661643933 +65336664363936343637363635326638626666373664636336316430393761643164643266666639 +64353761386165336334373031376163386435366330666263313664333832323163653164346138 +35336632393137653330613935323061366632333333623566376135643137656232613435333763 +62393436313930313139333963346233396235313534333863613563336165656137363530663639 +65333338313866623662313930613862313332613831653732663834333130363930666430363435 +30386433346331646631336239383430623761326333386432356136366532386330613239656564 +63333437643430663338633531613134323566366134653532643932393663386438353737376133 +35373662393466353436653538656434333039313632626465626466666239353536613032623532 +38646365363932353764633662326661326165333532316537333439366362376331353264333965 +32373130363637653461303661306562633961346432623237656431313033623034393062633536 +34646533336639383835316534306662356538646235376438396235633064396239663363313334 +34346636393238366666613734356465613035373166333135316535633530626364656234653735 +64363930326632313330343239616663666364333264303638313230366636613464363434356335 +33393733656537316431616333366166313937363130643230616531376363633430663234323365 +38653262623734396265326163383438666435613337663864623137333839633631316236306337 +30313634666230623565636661326438626566333263383433363964636461383835366638336565 +33333539343366653161613566306632396231376533396663623162663563353339393465363966 +63363838386538656463303362383664663334633730323432633137383632643236373039633763 +66643333643062343437636563306161636338666631393235326231616634303066373138373265 +36616534303065353635613032626365363663646235353931353766363134396162333037373464 +35393137653666353762363865613735393962353766633138366561386537643636383666393830 +35306437333062353137633533303834643931613635663032653432386164393362306465306166 +66646266383435316538393761336432363564343938356131353335313138383235393264633838 +61356665366231306566316331643732393230393536386537396137316237303863613463663734 +38396230653236623630323438386262393766363961636661356233623336363139306263643130 +33333835373537343732386431333463316137613939646233633931313764613838633664343331 +35386338663664366433343939383363396338346234316163646534643932346164396539663936 +63383161356430636164643538303163666161636236633462616533396465613032333161343235 +66633334326264346138656466663438643164633836383936393333356365336162356364636239 +34666461306336663663643963653632663132303765363932633133353739303566636338613161 +36313230616235393737333434633664376539323862333134646638386564393432633738306635 +62653563646164343961343437653034666333373731636539666331653563636437613431623766 +31613238373065386361623433643139343038313338633038333464316639636135323738626562 +30326134313864303338333532616339666237346163633065393832626331653039323763653138 +36396632396163326538616631383131346536333663383531366335376365626239306234646536 +66393034353030613730343931333263623535343730656634666364643134643233313065306435 +36643731313363343037323334343465323131643262636462343034643130303462316331393065 +62663666393363346166366234633234613339396434306138336333343664323133363036323933 +61653266616632356136373132616661363866633763306663646535333235666433353437303038 +61373465393433663934343561313463633237366130613431346132393036363730303464383133 +39346534313263626461643365613739316233396461363736343561333336343737393834616262 +61306236373766653664643561643162353064663334313532346436366236393463393534376662 +63386539633632356564666165653833343963326265643431626433373836353330326563393038 +64303162616366343733353034313633373035393834666438366163663565623064376266393464 +62646261303536363130633534613332326362306334626132653864626437386162336162633536 +37646638363965363636646438633965373965643465643361333964353566306233663730663338 +38653862663764393963626331363638376231373532363331386364343536653633636533376536 +33623937323862363436616163373430613739313261363338656165373330376134623036383862 +64663531323061626233623334323238356636336462633531326337333735323032323037383765 +65373434303134633861636665376531393164343831633232303439643336313435613062316436 +32396638373430346337396631343965666463643765613036626432343362356564623439336234 +31356638346266363738363863656239336663306465363162313936346437373632346438346462 +31366366376339633536393935633263346239353266663763313435613038303962646338343061 +37316239333863633036376265616665336532353238343336656637353239396161643862666263 +64346362623966623563623530656265363936666362396666373230333037656361613131643036 +32633632363936366261343362613936336430303736323261393733646564306537643430303732 +66613238366537613330393635336262363532613532316438623062306263373162666639366433 +38363935303431336135616363643066323336353530373831626264613263303237386232663637 +37613236383835306137333230636536626339373338363466326337386138333565353337636230 +39303665653637333161353537393062346263333134323233646238663035316566323433626338 +62623931663034313136356661366164313630363331616134363137633330323735646166623762 +66366136326462326331366566613036326639306531393362653834633035363366316237633937 +38623263316163663466616239633661336662643739356139393661313435346232323335643461 +65383738623535313638333861643335393131323638313339613465353735613335366362356463 +39633532653962313737666435363230646362343966303237373263633264343936353365343738 +64353033633366383038306533353639623533356634623466333464303433393238636238323137 +62316130326562386635366337666436336637633862396330346130626262346534336637333066 +33383263333039646635656261333966636637613637313737653538633862383762346162633765 +64376639656535383234346161643563643664363436356461373633653537643436303163326235 +31373165333935373936616164633937643966613033313635666161373663346336366265303830 +65396133353731336266353764383763653438306461316439663530663962353665626337326536 +61636439313038626631613032393739386630343163386435393966383132363062663833386638 +65343263626139663930623330663535303061353664323732653863343465376339633836353630 +62363334323764666261373766666436306130363164613066643631343365333539303639646365 +35613939393163636661313530333332383461623038653164303034346433373661613835346533 +37303131656431373139356534386630333935326264336232356334336535646237313465386532 +37333539616536316239633138656261376231663637386636353633633462346465633161663533 +34306138613332353464393861373734303934626332323032323961313039386264633232333864 +61643936643230366663643836613030373335393435373264333262353530353762323532653634 +65643634666666653865 diff --git a/host_vars/services.l3d.space/vars.yml b/host_vars/services.l3d.space/vars.yml index 2b11182..32e025d 100644 --- a/host_vars/services.l3d.space/vars.yml +++ b/host_vars/services.l3d.space/vars.yml @@ -1,23 +1,9 @@ --- -users: - l3d: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - mxusr: - - l3d@pinkie.l3d.yt - - l3d@mobile.l3d.yt - - l3d@backup.l3d.yt - - l3d@derpy.l3d.yt - - l3d@backup-rsa.l3d.yt - - l3d@business.wingcon.com - -accounts: - - l3d - - mxusr +l3d_users__local_users: + - name: 'mxusr' + state: 'present' + admin: false + pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}" acme_domain_unwant_list: [] # - name: 'example.com' diff --git a/host_vars/services.l3d.space/vault.yml b/host_vars/services.l3d.space/vault.yml index 4d2cb59..ffaf78d 100644 --- a/host_vars/services.l3d.space/vault.yml +++ b/host_vars/services.l3d.space/vault.yml @@ -1,86 +1,89 @@ $ANSIBLE_VAULT;1.1;AES256 -31643365396436313662383039303365353862633237393866333437316339613638333533343838 -3330306461623966666565303234633131366238626131620a306339656465653630353234336231 -63316430666139353138613565646436613665323531313762643937363034393833613838316562 -3831623630653530350a396535623863396166393065366532336463306638336162386662306336 -37386462633132636633666235396134333238633266333566303033356534633934306235313239 -65363038643337346636306661396561343463383332373138383533323962353837646362373863 -37373036613035386633353633303934386135306462383733616338356566653036626163303630 -31353266336232373038356365306530323061663765616664396265613433666234393033333739 -34633838366361366139343362353063383264316637363537633233393432393938346637666434 -33356636623434303462653261356439303239373065323764666531626637396535626661613834 -33353038356466656463626261626239313039323461306265363566333964383761376134643564 -33316565653037353632653633336666653833393862643964626431373836393266653761623330 -34353232323538333230353134646131626462653363363032643431333363643236366133623765 -36393130663732363537616664323535646134636331613939353563356538633138313936373038 -35336262303961326135666563633432323165346564333134323665386331613561653236636432 -38653031663832376339643037313233363033343863303234663165643135353531633634343933 -64333932383635663163663931663161356631323032303164616333653934303432373239393930 -63333566656463306135356464306638653437343964306265626234376232623235613666653963 -66343931666433386431626433643063343533356132323662363734636530636231656538336430 -62376339366263363062666237373837613466313934613866623463366234643632383334303864 -64333330663430633831633134386631326464373864343636303264326233346565326135383732 -39393462613137393935613933613337353763363337636436396466353633353834303465353139 -66363837393436663236356434653434383737616564316135356431366632393530333362383833 -35616239623762306337363862613638633636396461353165376231386431383065653866666634 -66376434663365303930626530313865646464646439306238666231633739663862613561656135 -39393635336232356466616430366239336338663064623461646135653237363637653335663931 -30636563633931306166616432373066343564663265613064303831353265613162653934633937 -33396166373039366330303938663937333965313437613638353034646662376637323761633832 -36383830336364396530646362393665633264376162376439613837373731396432666662626565 -61383663376139383934356663386630356135623866613731306461313635356437333061653839 -38633436363862353732656533313862316162613930376333363231376665653537313361663033 -31633937396633346639333336613336333763343831643134363064646632353531613733333030 -61643765643137623533396133333538353935336533656334633766653464316461313138333462 -38363161323131656636353762636563303239633039633934333462636139333135656663346431 -62333365633936396661643538623263666261363136626436616630306430323233303230393432 -35666630643261383932333835623330346665626330306539306331316562643063313031313434 -64666263653564383862623263666132316261303163363432366537633234623131393139396562 -38666639303038343338343633363636326330633931393332373663356561343036646262373830 -30663537653332393661313838316465316261333962653364343266383939646232633664636437 -66393963386636653765633264366163643663643839336631353161636662396461313761306263 -32383136383165633831623164333733333036316236636135626232326363643666613333333063 -36623564613265376438643031383231353562356234646231376534393737343235633033386331 -38383432643737376434376337666133316637636561346435376661306663346133663738643632 -33656163353833353866613337646163383637656364313831613434323538663662373164633461 -37346361626531333333373132383334353832316462613236643030383839383633653939336162 -39616261303434623834333962323865376630633238323861303265626139396134313961653834 -36356239373161373734616134336235613865346361613564666239376139393439323231633464 -64303430313930646530653662373535376236616666316466666630333733626633386264316433 -65313733396436373638643339373263333966383666393333323265316635306166373966353038 -32363031623039386234623531616633396164623063616239316232333866633538656435623731 -38393536333733666665393837323462373437643162353431356365396566613135326537333031 -30316263653632663438663862646165623636623334316566663166643838346437353261636366 -34646539323461386162326639353564326663303530323030306331316339373933386662333534 -64303762303134633866306164393933623163323765343363366635323537393265633465376234 -36323166303366316230363263333631313334366533303733383637393337326461326137656436 -33373236326139313533313037396130636666326639663337656464346261383832366331386539 -64393739663836653430643062313636623261386539303964653631616630666436366432313862 -36386135373933633832626139396533333433653236326162653635386561623332333730313632 -63393131643836636336303264376337636239306439363737643933363539353365343139363735 -35353963643934306437376362333931393162613835313236326633636332636334613138636663 -35366539363564663637343736646330633066313161666462653862663164333065633763653232 -65666337343533663631343637303033346561646632666264393337323662663762633738653664 -61353538386163363333323964656238663334336437383764656131373732336165613133383061 -34646230613962653339323364343634663935613131396461353231346462656135386463373563 -38656632656463363533643564653932623462356434646666363837396133393537323739626166 -64383564663437396532303536626439663936356261306536343837333162396331356561343138 -65333965353763376538333636376162616563313664396462636665303438393661356563623538 -64626363633665336337326536383637316131333632313336373663653439393430653863363662 -34353562663932646265353465643333373066663731653738393637353762366662303839656563 -66376532366632376434386635323934366232336230626236656264616234663437616163376638 -34333930363439396666653864663339616264353264323332393734333236656238306561366430 -63633638663966636461383365363635333834343636333132323638663731313462353032653665 -32623630353536623631306262393835306266646134353036376164653739336439613731353638 -64323331316562366462653362333563323735343465663763356565336464343061386364383537 -34383261616361653234626435663235343430346138656337636663363865373633306531613466 -31623661393436363639653739373264626539333436333066643034656161323934646464653735 -61663165396265373463666239663763373539633963343765363330623762383330303339316636 -34663938626330343234313563643264663364663261363863633433393962306534356634303632 -63643563663637663434343133386439666636653038343931656464623366313234323565616133 -38386131613533356637663639356636303365316633366465626630313934323061353861313763 -30623037323237353763356435613165643331373339353561326335306438373632646562643164 -33626433313633323734636632646638373535623964366566646461666533653130666531376535 -65646365333838663236363036616637366163626364396638626563386639396361393939613866 -38613565336464323133643062616362383734373762313363643661633038636330636138316265 -31373532636232303634633765373036623030316433376363373933653463343165 +30303965353563623236636538343366633132363838316264636361626461643431323862316562 +3963343432363065353339316263383236613262656335660a316461373938613031633535616462 +31386436343035646363353334386264313637356637373762306435376530653333643530356566 +6238666437303764620a303237636163346565613935303765313436336430356566306164666434 +66333136633661636366613437666236333432366663643561656535346631323063643133336334 +30333535356137356162636333613338366439343030306234333461633862356237373234383934 +35663363383439653565363661313861646136333966323237353134386431376137373432353464 +63613731353736656635656233663435643931613564346231373166643763316637376661643933 +65336664363936343637363635326638626666373664636336316430393761643164643266666639 +64353761386165336334373031376163386435366330666263313664333832323163653164346138 +35336632393137653330613935323061366632333333623566376135643137656232613435333763 +62393436313930313139333963346233396235313534333863613563336165656137363530663639 +65333338313866623662313930613862313332613831653732663834333130363930666430363435 +30386433346331646631336239383430623761326333386432356136366532386330613239656564 +63333437643430663338633531613134323566366134653532643932393663386438353737376133 +35373662393466353436653538656434333039313632626465626466666239353536613032623532 +38646365363932353764633662326661326165333532316537333439366362376331353264333965 +32373130363637653461303661306562633961346432623237656431313033623034393062633536 +34646533336639383835316534306662356538646235376438396235633064396239663363313334 +34346636393238366666613734356465613035373166333135316535633530626364656234653735 +64363930326632313330343239616663666364333264303638313230366636613464363434356335 +33393733656537316431616333366166313937363130643230616531376363633430663234323365 +38653262623734396265326163383438666435613337663864623137333839633631316236306337 +30313634666230623565636661326438626566333263383433363964636461383835366638336565 +33333539343366653161613566306632396231376533396663623162663563353339393465363966 +63363838386538656463303362383664663334633730323432633137383632643236373039633763 +66643333643062343437636563306161636338666631393235326231616634303066373138373265 +36616534303065353635613032626365363663646235353931353766363134396162333037373464 +35393137653666353762363865613735393962353766633138366561386537643636383666393830 +35306437333062353137633533303834643931613635663032653432386164393362306465306166 +66646266383435316538393761336432363564343938356131353335313138383235393264633838 +61356665366231306566316331643732393230393536386537396137316237303863613463663734 +38396230653236623630323438386262393766363961636661356233623336363139306263643130 +33333835373537343732386431333463316137613939646233633931313764613838633664343331 +35386338663664366433343939383363396338346234316163646534643932346164396539663936 +63383161356430636164643538303163666161636236633462616533396465613032333161343235 +66633334326264346138656466663438643164633836383936393333356365336162356364636239 +34666461306336663663643963653632663132303765363932633133353739303566636338613161 +36313230616235393737333434633664376539323862333134646638386564393432633738306635 +62653563646164343961343437653034666333373731636539666331653563636437613431623766 +31613238373065386361623433643139343038313338633038333464316639636135323738626562 +30326134313864303338333532616339666237346163633065393832626331653039323763653138 +36396632396163326538616631383131346536333663383531366335376365626239306234646536 +66393034353030613730343931333263623535343730656634666364643134643233313065306435 +36643731313363343037323334343465323131643262636462343034643130303462316331393065 +62663666393363346166366234633234613339396434306138336333343664323133363036323933 +61653266616632356136373132616661363866633763306663646535333235666433353437303038 +61373465393433663934343561313463633237366130613431346132393036363730303464383133 +39346534313263626461643365613739316233396461363736343561333336343737393834616262 +61306236373766653664643561643162353064663334313532346436366236393463393534376662 +63386539633632356564666165653833343963326265643431626433373836353330326563393038 +64303162616366343733353034313633373035393834666438366163663565623064376266393464 +62646261303536363130633534613332326362306334626132653864626437386162336162633536 +37646638363965363636646438633965373965643465643361333964353566306233663730663338 +38653862663764393963626331363638376231373532363331386364343536653633636533376536 +33623937323862363436616163373430613739313261363338656165373330376134623036383862 +64663531323061626233623334323238356636336462633531326337333735323032323037383765 +65373434303134633861636665376531393164343831633232303439643336313435613062316436 +32396638373430346337396631343965666463643765613036626432343362356564623439336234 +31356638346266363738363863656239336663306465363162313936346437373632346438346462 +31366366376339633536393935633263346239353266663763313435613038303962646338343061 +37316239333863633036376265616665336532353238343336656637353239396161643862666263 +64346362623966623563623530656265363936666362396666373230333037656361613131643036 +32633632363936366261343362613936336430303736323261393733646564306537643430303732 +66613238366537613330393635336262363532613532316438623062306263373162666639366433 +38363935303431336135616363643066323336353530373831626264613263303237386232663637 +37613236383835306137333230636536626339373338363466326337386138333565353337636230 +39303665653637333161353537393062346263333134323233646238663035316566323433626338 +62623931663034313136356661366164313630363331616134363137633330323735646166623762 +66366136326462326331366566613036326639306531393362653834633035363366316237633937 +38623263316163663466616239633661336662643739356139393661313435346232323335643461 +65383738623535313638333861643335393131323638313339613465353735613335366362356463 +39633532653962313737666435363230646362343966303237373263633264343936353365343738 +64353033633366383038306533353639623533356634623466333464303433393238636238323137 +62316130326562386635366337666436336637633862396330346130626262346534336637333066 +33383263333039646635656261333966636637613637313737653538633862383762346162633765 +64376639656535383234346161643563643664363436356461373633653537643436303163326235 +31373165333935373936616164633937643966613033313635666161373663346336366265303830 +65396133353731336266353764383763653438306461316439663530663962353665626337326536 +61636439313038626631613032393739386630343163386435393966383132363062663833386638 +65343263626139663930623330663535303061353664323732653863343465376339633836353630 +62363334323764666261373766666436306130363164613066643631343365333539303639646365 +35613939393163636661313530333332383461623038653164303034346433373661613835346533 +37303131656431373139356534386630333935326264336232356334336535646237313465386532 +37333539616536316239633138656261376231663637386636353633633462346465633161663533 +34306138613332353464393861373734303934626332323032323961313039386264633232333864 +61643936643230366663643836613030373335393435373264333262353530353762323532653634 +65643634666666653865 diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index c56ba4f..84a05cb 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -50,9 +50,7 @@ acme_reload_services: acme_restart_services: - 'gitea' -acme_domain_unwant_list: - - name: 'backwesen.de' - - name: 'www.backwesen.de' +acme_domain_unwant_list: [] # - name: 'example.com' nginx_sites: diff --git a/roles/l3d.nginx_exporter b/roles/l3d.nginx_exporter index 4bb172e..8305743 160000 --- a/roles/l3d.nginx_exporter +++ b/roles/l3d.nginx_exporter @@ -1 +1 @@ -Subproject commit 4bb172e407c75ce73ad1a0d1163a8d8354ec9f0a +Subproject commit 830574300d2c022d695bc6691abdb05f55529ff3 diff --git a/roles/l3d.rustdesk b/roles/l3d.rustdesk new file mode 160000 index 0000000..d7620f1 --- /dev/null +++ b/roles/l3d.rustdesk @@ -0,0 +1 @@ +Subproject commit d7620f16cd873159e3dbe041dbd015313985e528 diff --git a/site.yml b/site.yml index 66f9c25..b2e5876 100644 --- a/site.yml +++ b/site.yml @@ -12,7 +12,7 @@ - {role: l3d.users.sshd, tags: [test, users, sshd]} - {role: l3d.packages, tags: [packages, general]} - {role: do1jlr.ranger, tags: [packages, ranger]} - - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']} + - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian' and "ansible_architecture" == "x86_64"]} - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'} - {role: do1jlr.rtl_nic_firmware, tags: [apu, rtl_nic, firmware]} - {role: do1jlr.avahi_client, tags: [avahi, avahi_client]} @@ -22,8 +22,8 @@ - name: User specific roles for all hosts hosts: all roles: - - {role: do1jlr.admin_base, tags: [default, init, users, accounts, dotfiles]} - - {role: do1jlr.dotfiles, tags: [default, dotfiles]} +# - {role: do1jlr.admin_base, tags: [default, init, users, accounts, dotfiles]} +# - {role: do1jlr.dotfiles, tags: [default, dotfiles]} - {role: geerlingguy.firewall, tags: [default, firewall], become: true} - {role: robertdebock.fail2ban, tags: [default, fail2ban], become: true} @@ -54,6 +54,7 @@ - {role: grafana.grafana.grafana, tags: [grafana. monitoring]} - {role: prometheus.prometheus.prometheus, tags: [monitoring, prometheus]} - {role: l3d.homebox, tags: [homebox]} + - {role: l3d.rustdesk, tags: [rustdesk]} - name: Deploy legacy mail config hosts: mail01.l3d.space diff --git a/templates/files/nginx/sites/mx.l3d.ch_tls.conf b/templates/files/nginx/sites/mx.l3d.ch_tls.conf new file mode 100644 index 0000000..3eb38d2 --- /dev/null +++ b/templates/files/nginx/sites/mx.l3d.ch_tls.conf @@ -0,0 +1,17 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name mx.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + root /srv/www/services.l3d.ch; + + location / { + charset utf-8; + try_files $uri $uri/ =404; + } +} diff --git a/templates/files/nginx/sites/nginx-exporter.services.l3d.ch_tls.conf b/templates/files/nginx/sites/nginx-exporter.services.l3d.ch_tls.conf new file mode 100644 index 0000000..7f144ca --- /dev/null +++ b/templates/files/nginx/sites/nginx-exporter.services.l3d.ch_tls.conf @@ -0,0 +1,24 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name nginx-exporter.services.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + + location / { + charset utf-8; + proxy_pass http://localhost:9113; + proxy_read_timeout 3600; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + allow 127.0.0.1; # allow requests from localhost + allow ::1; # allow requests from localhost + allow {{ prometheus_v4 }}; # allow prometheus IPv4 + allow {{ prometheus_v6 }}; # allow prometheus IPv6 + deny all; # deny all other hosts + } +} diff --git a/templates/files/nginx/sites/node-exporter.services.l3d.ch_tls.conf b/templates/files/nginx/sites/node-exporter.services.l3d.ch_tls.conf new file mode 100644 index 0000000..95449a4 --- /dev/null +++ b/templates/files/nginx/sites/node-exporter.services.l3d.ch_tls.conf @@ -0,0 +1,37 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name node-exporter.services.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + + location / { + charset utf-8; + proxy_pass http://localhost:9100; + client_max_body_size 256M; + proxy_read_timeout 3600; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + allow 127.0.0.1; # allow requests from localhost + allow ::1; # allow requests from localhost + allow {{ prometheus_v4 }}; # allow prometheus IPv4 + allow {{ prometheus_v6 }}; # allow prometheus IPv6 + deny all; # deny all other hosts + } + location /nginx_status { + stub_status; + allow 127.0.0.1; # allow requests from localhost + allow ::1; # allow requests from localhost +{% for ipv4 in ansible_all_ipv4_addresses %} + allow {{ ipv4 }}; # allow local ipv4 address +{% endfor %} +{% for ipv6 in ansible_all_ipv6_addresses %} + allow {{ ipv6 }}; # allow local ipv6 address +{% endfor %} + deny all; # deny all other hosts + } +} diff --git a/templates/files/nginx/sites/services.l3d.ch_tls.conf b/templates/files/nginx/sites/services.l3d.ch_tls.conf new file mode 100644 index 0000000..4c6799b --- /dev/null +++ b/templates/files/nginx/sites/services.l3d.ch_tls.conf @@ -0,0 +1,17 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name services.l3d.ch; + + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; + + root /srv/www/services.l3d.ch; + + location / { + charset utf-8; + try_files $uri $uri/ =404; + } +}