Inventories Update

inventories/pvjjk-1vos-niinisalo/group_vars/pvjjk_1vos_niinisalo

@@ -1,7 +1,7 @@
 $ANSIBLE_VAULT;1.2;AES256;pvjjk-1vos-niinisalo
-33626530633633343930643365353865363637353932383533653137336461386136303433666130
+37613036623862376237376236356664633265373639653365366464393639613565653862623564
-6132376364633136366538353466313464366164633339380a646139353563323966613935666664
+6132376432323938346134333634643164366632363133660a656139663562366561313037363636
-31643638666439333563386231333037373033653734613563626137333631666361623034613436
+62333332363630343836313638363137306130643064353433376238636237663165346531303165
-3966393739636534650a633638383961333937383130303038626465326465616333626465303335
+6434333233653234300a356637616261643437663832666639663638316464643265353764333931
-37323531653335613535366534323761333938623933383236356466366230353965346366303164
+35646131376137303035643666393238653636336464626633376335353834353633653166353761
-3862333635643161353463306431303936393062616339323834
+3833356663663465356233373539616532313234616361323431

inventories/pvjjk-1vos-niinisalo/host_vars/argo.aito.tjas

@@ -1,6 +1,6 @@
 $ANSIBLE_VAULT;1.2;AES256;pvjjk-1vos-niinisalo
-38303231643539646631303933373431326331623033326661653533613739363963613138366136
+62333336643031626164316430383831663039636431363630613564383663643332336336353965
-3030303335346635643133636565386433623866323333320a346638346235653434623930653437
+3536666339316362333264656332303862613134313433660a303032333031363233636235656632
-33303231643536663532353235363961313637353830376138626630306133653334303264356335
+61333366376662376631383361613065396264316136343531316335333862646264326263313064
-3361373161666534350a363233346665616437646562636135373531646663333161333064316333
+6162623435336662310a623561636535353035376565663865646161356338326333663339346666
-3134
+3161

inventories/pvjjk-1vos-niinisalo/host_vars/olympus.juva.tjas

@@ -1,51 +1,94 @@
 $ANSIBLE_VAULT;1.2;AES256;pvjjk-1vos-niinisalo
-32653637663866356332306361353964303131616465363963343664313536353434316366613262
+65633737616138353731633133323435613662386663656431663662303536323962323439313236
-3730653431636437353433626431363764373239306637320a366230306565343464636533653931
+3036643862653039626362343631373938376466366638650a646535643166646462396165383266
-31303734336166346530613662306237656662623366636532656535633539383835373337383233
+35616133356232356438626262316638373364303165393935623331346537346666376464346664
-3465323337633235360a373338633562623636663366306635633235313334306338633234623663
+3638313730653461350a636131643132633035616536316539656362383639316132666436666362
-34643733376431626438643531396332346631656337633835613332663435306438313338323031
+61393134323734316532333930353764663937343333363630633163636365623765343539346439
-63616264386438393133616238383665376338613334396561616435666365643037323336643931
+38643932343362343362613730353233623738373836386431363535393766363761346261396462
-30333962326132666133306263636662663564643430653165393238343938333264636438323362
+32396634346461633331623133326563373865366665396132306636616333616361663336333939
-32303162396435303262663938663033623232346663373061313061386163643136656661636230
+34386338383361653066653039653031333766373735353762396536643838616363393263363265
-37343330656535396135646364316365346133663663626237393336323331376465323734643931
+38656563623231643035613435643033633263373135333038393738313566366439376465656433
-37336130663563353665643938376264313033396136626135383332653866633832396566616530
+62626166333637653362346332306563343739343265616437393633346137353537623537373031
-36666563396232356339363630643162653436663063306162646661633864653663343230646663
+31346438633933363839316136643961343366636233313532663261353464343965376135616539
-66366632653638386361633562363534316666356261623038636236613763383038383061313365
+64613761333665356134306265656166613964613731653364383534623861366161623362643133
-66363862306335393934336461613637393466363162323735363763343131613065623433626134
+32653733393465643465386465306231623963383637626432383830666563663238623132613534
-39356136653462613461653733663662373965326464363132393465633033613564303264653533
+35363634393732366132663836636563623663346534383863656633393338333634616334313137
-35316562356639646365613237343061303132626436343535326462613065616432323366393039
+62303237306562623832373061303230623166666538623165336230663139336461626366353366
-62643365353837666635363663613862323637366363396262366135666266303661393539643561
+62373231343637353836613663376235346331666135356538623939353763373430373438366137
-34383132356437376330396637303332306566306162326164323931666238393865663030336665
+62663961633334373162616436313835663139646436366664663134303064633434343730333537
-63616265393335353535323463666639393630386535323830616661393430373136373938653532
+32333763616539393438323339353763373533363866616335393239616239623435643034646663
-34393166383933313830646361303836323065616133666262383139363165336631396230396566
+62613062656637326630646565306437613332313235333736343037666234663139323961383836
-35386238656162353530373130336631323237616539376461326132366165333662346134346461
+37613438343664633564656665633035366635646331363631623433383532623230353632383036
-61613066376463383734343232313133373030626337346361363730663861316465363635376536
+30326161653635303138363662333138376363626565653363383535626434313264636163386436
-31333132316462336262613832373532323233326335333934626330393339383330613933316561
+33366163393839386663623839656662383938313130326562363934643035353864316361646463
-64663539366639336635363736353962653637656466313033616266316630623734613939663736
+32366235623236373666623933653337303666366563373163613535636332313038653331353863
-32363932323733633165326236643536633864353864613565396238333261333337623831633233
+33326439613865633234643966383833323361613238376664313764663132376463396232306236
-32323163353264663837313836633864616336643538326563646235383633356365346434643930
+61306265383231636434636333663833366139323634313566396462626530343338333934333265
-62323765396365326438636566636134663065386565653438363466316465323265646435636561
+38643234663663653739383630613664376239633230613937333462313236623630653664376363
-39613235636133626534323834656363326231393364356438356238346339633064356230366136
+36653661636539343238363636646139383437653663343832393162383966303230666265366532
-30393838346130613230613562383963393661343766333039616333316333373139383236313730
+64366435636162363135643533346565356537323761303466616332626531653331623464663735
-38363239653962333732383436373935303163636531316439383339396531366230613635383630
+63653161353962613132646465356261343239666661613835643238646363303032653537353634
-38643331363136636364303831613231383063663662393162353463386136376662383534633936
+63326235636336353839373436613030623662306134336334663732353362376564333037623532
-38356565636539663135306535666564313332373336393139383831383937626563306264633865
+36353264343161373361366337396433313932373762353765343861366239313633646666393234
-39643466363362333561643863653465366265633363373361303863393665666663633430646138
+37333761346662336237366334663866666263656663393031343737393965326632376161393764
-36663830623939366163653138343230343731613038333237323734656238353830323766323131
+30636362663431643463323633623330623063306165346532313063623239313832306566366236
-30366632626361343633303061323335633965643564313363623364643231396534663865353735
+39373731313933346636653762346630313765306538633831356539636636623761333765666432
-37383539383965356539383163373966643263643634613762666632363561363666346339623233
+34343730306363353465306337666436663137376666343737386538313333366339336235663639
-66313639346631313538643130343361346336363839343061336165333931343931323935623734
+32353531626366663133653137666531626236613665363539366639376134373335396330356164
-38623835653934323662306431336531313331616461393338336366616239356232653232393633
+39306436336239643931373339346230343432643838623439383439656539383637356361663266
-66366434306333623638343464316137303764366335663462613736656535663362386634323237
+34633033626538353265316338326230363639323035646130643262626233383462386430306535
-31643962333832373164383731613262663933336565653362663230366432653637663739363734
+37663830353030346433303266363736616563636235643339383665613565343162613933623665
-30666538343162383338343965636339326634643339306333353239663630363662373332316562
+62313136383930373439316337333434346636356463663164326461643766646635666364666237
-39383262653730616336363831323437666565306364366232316433333139373231666431636334
+31323830376231643232613139383737643664396334646533366330326465386138373965646165
-35336163613832633233343633393535313663656331376139313266623132643063366665623765
+32613861663235633131666537623433386637646231316331326561316131373836633332303033
-35323861626239393064306462383765663433366535613433383037663762633161306461623862
+31633431393239363630316166373532376561363061353966353835636161336230356666383230
-39386336363838616465663361623861353165346564636262373935393165363233626539646163
+32386631653336346364363964663564656664333831376161636439303964363537663638316531
-30626532613833663238343536333865343765653461666437663831613139633030613831343966
+35653462346363616438343463396431633663653039393863313931646261376439623566363434
-32396134333235616562333362306236646531646232633565396531333664303232396132333537
+37393434633162663636313961313562303233653935623234373262643834393461626263366439
-31353461393832376362353136333863396335626535663836323138336161343139393034323261
+66363536353065353366646461373430343730353630313835626538313337346633313062623362
-33336335363834653939363438373435643561613032306435316262333435333432316663363465
+35656530393366333632613032383539316531653933313464643537316437326534383136363364
-65616363313630616365623332613034353961363665626164306361333266303339666462663264
+31623632613138613133653563396363343538346562613263376365323839663364636265636163
-3031623763396234336539306332643035326162363036636262
+36663730356564303133633561376230306565366465363938323037326663626564653061626535
+33313732393163383335626138366331643164316635353438646539653861343535363634633036
+64653431353137613133653765623164326439313161323432663732633339316431383338626330
+36306134623439343930626364336261363136383737663938306365396261346538376235636537
+38303262393438316335656530353336373737386230646362383132336564626331373231343163
+35323264616537326238656437306433643939376666623461353132633438346262396630613065
+33323463313536636131383165326661663831616337356131646632303162316236303931376533
+65333234306336356236346236623132396137366537666335323930623337396435393631616462
+34313835666366326332323863616637333838343535626136356162316366333163353564623135
+36346461656461346565323566326333323230343161393033356132356639633364373065373631
+31333032356231663734366132613963393532363933666339636563343732313462303238353635
+61393165316666383031323763323434623130316264313439346636373166633766653037643566
+61386362336139303733396463373135323036653164343039363065643064316461623262383161
+30306339626438306166336331373466626264643263316339636262303661363632633831306637
+36636638656162376363623264666261313836353032363330323965306661303237343932336432
+39366663636332353665333233383162363439336534363837386139623730313764623034396330
+30633738326136333933323166646264643036393464346232303938663461656530306336613133
+38346238613331323564313230633837343465353335353031356365383738363164383731313732
+36366563373163653939356136643233633465666430386133306335376334373834313534646535
+37323137333038613435346637633165373732383739316163666665366164623333383837326438
+62636336666237646132323932353466366233393335663430386331326335613839623030356165
+66643365626532323066343736386463633262343864643737376233653932326437336465663264
+30653430633731626461616236303765353766346634636537643831386235306333656431663733
+37623863376137613332646230656663323838373238306639623466623934303138636332373662
+34323465666335303262663963333066306166366261326533653232356236383036363038313133
+64326334303663633933353130666639656637383063313364663961656561666662313737626235
+30376330313964316332383230663562353434666566656330333563656432646361393234636263
+66313961343462626632366136616132313039636665373736306138343831393134396562663735
+61356338393961626339626361326134626265383633633266656438643133336537643839333965
+62323061306134346635646234313137656465663433613866313535663164363266326665373834
+65373966346161373465646462636133353137393736323964636537633932326634393432326335
+64333562373462336136343361383431373030653236336534663361346132333530303736316664
+32343832396139356466653562313136643961353965626638313330646163316431646663306564
+61366666656663666630636131643831383261666365353636353234643130633238363534303966
+30643164343163366362303661346538363862366562336436666632643637353334666338643735
+65363033643963316238386535326162323734386434643162326562386335393933353939313064
+64613637656532343566336637386439663239363832363662393732306265623539326532323237
+64656433633235333261653534613535633430633039316364663137363063353366643539313339
+34373262373833326432616236303735626136636538656237353764313531353034643835643066
+33333838313265653663663331653938356331376561363930363666323539636136313262663231
+33656464323162613565633135383066373239626230343535326338633438346131316636333234
+62623663313662316166393832346135306332363839386132366565656162643336303037303235
+38363165313232333962646339636162383837376437653432663865383563353862656633353762
+3036

tasks/deployer.yml

@@ -453,6 +453,120 @@
     - powerdns-recursor
     - dns
 
+- name: "Deployer - OpenSSL - Configure - Create Folder"
+  ansible.builtin.file:
+    path: "/root/data/openssl/"
+    state: directory
+  tags:
+    - openssl
+    - www
+
+- name: "Deployer - OpenSSL - Configure - Generate Private Key"
+  community.crypto.openssl_privatekey:
+    path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  tags:
+    - openssl
+    - www
+
+- name: "Deployer - OpenSSL - Configure - Generate Certificate Signing Request / Root"
+  community.crypto.openssl_csr:
+    path: "/root/data/openssl/{{ cert }}/csr.pem"
+    privatekey_path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+    commonName: "{{ config.openssl[cert].commonName }}"
+    organizationName: "{{ config.openssl.certificates[cert].organization.name }}"
+    organizationUnit: "{{ config.openssl.certificates[cert].organization.unit }}"
+    countryName: FI
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  when:
+    - config.openssl.certificates[cert].location.providence is not defined
+    - config.openssl.certificates[cert].location.city is not defined
+    - config.openssl.certificates[cert].domains is undefined
+  tags:
+    - openssl
+    - www
+
+- name: "Deployer - OpenSSL - Configure - Generate Certificate Signing Request / Intermediate"
+  community.crypto.openssl_csr:
+    path: "/root/data/openssl/{{ cert }}/csr.pem"
+    privatekey_path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+    commonName: "{{ config.openssl[cert].commonName }}"
+    organizationName: "{{ config.openssl.certificates[cert].organization.name }}"
+    organizationUnit: "{{ config.openssl.certificates[cert].organization.unit }}"
+    stateOrProvinceName: "{{ config.openssl.certificates[cert].location.providence }}"
+    localityName: "{{ config.openssl.certificates[cert].location.city }}"
+    countryName: FI
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  when:
+    - config.openssl.certificates[cert].location.providence is defined
+    - config.openssl.certificates[cert].location.city is defined
+    - config.openssl.certificates[cert].domains is undefined
+  tags:
+    - openssl
+    - www
+
+- name: "Deployer - OpenSSL - Configure - Generate Certificate Signing Request / Service"
+  community.crypto.openssl_csr:
+    path: "/root/data/openssl/{{ cert }}/csr.pem"
+    privatekey_path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+    commonName: "{{ config.openssl[cert].commonName }}"
+    organizationName: "{{ config.openssl.certificates[cert].organization.name }}"
+    organizationUnit: "{{ config.openssl.certificates[cert].organization.unit }}"
+    stateOrProvinceName: "{{ config.openssl.certificates[cert].location.providence | default(None) }}"
+    localityName: "{{ config.openssl.certificates[cert].location.city | default(None) }}"
+    countryName: FI
+    subjectAltName: "{{ config.openssl.certificates[cert].domains }}"
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  when:
+    - config.openssl.certificates[cert].domains is defined
+  tags:
+    - openssl
+    - www
+
+- name: "Deployer - OpenSSL - Configure - Generate Certificate"
+  community.crypto.x509_certificate:
+    path: "/root/data/openssl/{{ cert }}/cert.pem"
+    privatekey_path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+    csr_path: "/root/data/openssl/{{ cert }}/csr.pem"
+    provider: "ownca"
+    ownca_path: /etc/ssl/crt/ansible_CA.crt
+    ownca_privatekey_path: /etc/ssl/private/ansible_CA.pem
+    provider: selfsigned
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  when:
+    - config.openssl.certificates[cert].issuer is undefined
+
+- name: "Deployer - OpenSSL - Configure - Generate Certificate"
+  community.crypto.x509_certificate:
+    path: "/root/data/openssl/{{ cert }}/cert.pem"
+    privatekey_path: "/root/data/openssl/{{ cert }}/privatekey.pem"
+    csr_path: "/root/data/openssl/{{ cert }}/csr.pem"
+    provider: "ownca"
+    ownca_path: "/root/data/openssl/{{ config.openssl.certificates[cert].issuer }}/cert.pem"
+    ownca_privatekey_path: "/root/data/openssl/{{ config.openssl.certificates[cert].issuer }}/privatekey.pem"
+    provider: ownca
+  loop: "{{ config.openssl.certificates.keys() | list }}"
+  loop_control:
+    label: "{{ cert }}"
+    loop_var: "cert"
+  when:
+    - config.openssl.certificates[cert].issuer is defined
+
 - name: "Deployer - Nginx - Configure - Create Folder"
   ansible.builtin.file:
     path: "/root/data/nginx/"
@@ -505,10 +619,11 @@
       - "{{ ansible_facts.user_dir }}/data/nginx/index.html:/usr/share/nginx/html/index.html:ro"
       - "{{ ansible_facts.user_dir }}/data/nginx/config.conf:/etc/nginx/nginx.conf:ro"
       - "{{ ansible_facts.user_dir }}/data/nginx/conf/:/etc/nginx/conf.d/:ro"
-      #- "{{ ansible_facts.user_dir }}/data/certs/:/etc/nginx/certs/:ro"
+      - "{{ ansible_facts.user_dir }}/data/openssl/:/etc/nginx/certs/:ro"
     restart_policy: always
   when:
     - (deployerTaskN1 is defined and deployerTaskN1.changed) or deployerTaskN1 is undefined or (deployerTaskN2 is defined and deployerTaskN2.changed) or deployerTaskN2 is undefined
   tags:
     - nginx
     - www
+