From 8096a860a0385a0a862c6139fa446ac1ee938a45 Mon Sep 17 00:00:00 2001 From: josiah Date: Mon, 20 Apr 2020 22:06:25 -0500 Subject: [PATCH] Fix vars, update vault syntax (: not =) and remove host vars. --- ansible/group_vars/all/main.yml | 14 ++++ ansible/group_vars/all/vault.yml | 84 ++++++++++--------- .../roles/gitea/templates/gitea-compose.yml | 6 +- ansible/roles/gitea/vars/main.yml | 7 -- 4 files changed, 62 insertions(+), 49 deletions(-) delete mode 100644 ansible/roles/gitea/vars/main.yml diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml index bf04f32..ca66cc6 100644 --- a/ansible/group_vars/all/main.yml +++ b/ansible/group_vars/all/main.yml @@ -43,3 +43,17 @@ wireguard_clients: pubkey: z5ogJTRX4K5evGOntpkIVopZFUVeTzAOaBtRS0K71TU= # mojos slack_bot_token: "{{ VAULT_SLACK_BOT_TOKEN }}" + + +# GITEA shit. +GITEA_USER_UID: 1000 +GITEA_USER_GID: 1000 +GITEA_DB_TYPE: postgres +GITEA_DB_HOST: db:5432 +GITEA_DB_NAME: "{{ VAULT_GITEA_DB_NAME }}" +GITEA_DB_USER: "{{ VAULT_GITEA_DB_USER }}" +GITEA_DB_PASSWD: "{{ VAULT_GITEA_DB_PASSWD }}" + +GITEA_POSTGRES_USER: "{{ VAULT_GITEA_POSTGRES_USER }}" +GITEA_POSTGRES_PASSWORD: "{{ VAULT_GITEA_POSTGRES_PASSWORD }}" +GITEA_POSTGRES_DB: "{{ VAULT_GITEA_POSTGRES_DB }}" diff --git a/ansible/group_vars/all/vault.yml b/ansible/group_vars/all/vault.yml index 7f2c183..9721f56 100644 --- a/ansible/group_vars/all/vault.yml +++ b/ansible/group_vars/all/vault.yml @@ -1,40 +1,46 @@ $ANSIBLE_VAULT;1.1;AES256 -30656537366435646662333339623433346237373735303130626165343431633039643038333765 -3732333465343539333065323235663233356336643633610a346366363165346439636232383234 -37653663623638646230303939663364623466636136643562633637303130343063383130396437 -3465346661303263300a666565643461326635636636666132623961313037663835666465386531 -34643037643932343837386238613665386362306638353331613763383264656436653161326235 -35393361393236303037376535346139633435336235313130356236363564623762326433386463 -37306437656333373166623738353963346536376162663563393539326463653735666134623837 -35363233666465323965636462653231663666373634626263343136363664643831393662613865 -37613735396663306564373833363936343837396239633636626132666662336538336639646338 -30613638306466386439373961613330663263323261333932613066633338663139383139356335 -63356466346637373166643762306465316666333233343765353835613437363338373631653163 -38656136663837383539643263363036323038386331633933386238396266633263356164643130 -64663361646136313265313231303738643661623365396230633036336536303132656338393437 -35653331396330343134396164343466383435343239343362306432383937613532323536616637 -38306537306466373562356161376133316635383363363134663632626530663038393263333730 -39363466656435656330353232336131343339306130323532313665396430346666643638653239 -36366638313466343162343730353538366465306666653861383939363232393936376535303165 -31656465653664303664346532316631363161316437306234386166366165623264393537316163 -61386133316634343239333639323432633063376137663863393938626465316431646662323233 -61343363333739613935316363396361346534616338396231663835336634313134386262333131 -61323432343634376665386666316537313566343030333461303830373734353939643436666539 -32376663336435386661373365386266343130373761366331646134396234383235636632373137 -36646239343061636461636435363562613232333537346334306265623332323566323739353439 -37623036333135303233323563353465313236616636393039356566396435373139376139626434 -34326433336633336534333436386339373062313038613566383039353464663466366666393363 -39316132623731393733393366643438636635643563326337303066643164623461646330663531 -66343638303966353430396161393031393830633866386433633964633364396437373832616237 -34616539663938333239366535366264366533663933613730386166323436356232303035613065 -63306162326237366230633636323461626238323538336530323739343461343130373631346537 -37643434313432303733396166636439656234623332343438353331303762343836663731306161 -39636666666137653832346131366434313964383531343930646462303236616433646162363263 -34643035613439623333613132353562366130313939616337303662383934366430613630613766 -31363233636264373438313430633135353930656530323332336366636337353532383934373335 -35356438363534343935343334653562343136633362613432393136333033626139643135643238 -35353638316333373834333263633431386138653365636437636636633363326261643665323962 -30383762306162346638353239336333356435396239353535306638383535323261366662363862 -38303363386230326537633435613338373534353565306235323462636662633836303437636138 -61353864363032626162616266613463623033336661653436643030626436623832613731653631 -656532386435336638616139636230386166 +37306564313734663334643866623235366264666338643438613163393436666238643462353330 +6138323765373735353062623936326437326337616561300a643730393363643533396233326665 +36346362396162663934653231313830666131396166383431363737323462393566373534353362 +6363366464613861640a306464383833626339636661366466363964396161306533653661353962 +61613863306262633038313033636436623161343031663263396364616335383362313865396634 +63323736626135313963633965346336386434373762356335626238653562656635616562626462 +31306535613364393032366231383163363666356164363561643630326137623764623835643063 +36613561613065316534333734626337646264306362313862313834343938666239663663313535 +39356130653235646232653236633434633165363364376131336530666433393261373138346637 +39636437336230326231636430623435353639653136633033386535373064643933336138363230 +38623136363863323063636166626262313635393165653730656663303336326432343131386136 +37333863326539316361346631313436313461636334643739306230633031383532653065333236 +34346261353938336138653762336564383633336463313835633466316532393337353261613839 +63343433663461343666383235653932303634373033376432643663323565316232323030663866 +61363062616437633664633030396438633563666439363261643032323664313530363763316432 +35383433356663383135313966636661303566363332306530333931353666313538616131663162 +66366361336564646338363463386330393830303637653464376464366331306432376262636162 +30643932626536383439383531323364303634663262633164393965333363313833656432663764 +38666236346634376336353037643463386136366265316262306263393432323731623731623933 +62613034306663303136306437306664316239306533313562393735383836636562373064373762 +37653334386366336230643137373231313761616135393837616562366636386133636431643764 +31393635323765626166616365373263316165616237643364626464376165373439356431366134 +65323731666162376235613632373035346534663031616662383433353063333963366433326435 +66303834363330346136353837633739333738373262636535396461643634326636656330666166 +30383464393734636433633962313563353264656638323131316231636566623738656439653338 +31653230346236313964376231623034346635396363626433383233626561383235633638303834 +37393037363231356261363965326538353565646439323231346531353837333663636264303564 +66633734303136306562613735353430303630616632613863333232343539353839633366383939 +30346662663534616335306238393463643833356266383065656130383338323361666633383264 +65646333366332656332653732383164653366343536313264626131326361646561363133363236 +35353731666238383966643530323465373661326539363836346630646666346336323539643537 +37376637353136626361363335346237326638663838396362646534356432636339656537326162 +61343361373063386439353765646166626332616339373161346237383561636530306130383263 +61646136313835366336633664623365653862313935313065653461366562333862313365393766 +30616462333563653936303536613034613836383466323662633463333230653838306137323261 +35623132613733356536366432666430663137303666653966623437356433653930613230383632 +33666665306533313632313166373637636632633161363234633665356435393636386434643330 +35623965336266303662626561646330363033333162346163393734363437653538323336326461 +37346632616565626662303531643065363836353034353938663332633564333231306464303262 +38303763663266333865323834386232646161333238653461353135616339333534306333396531 +37353165306338663639643430303663353932633530363531336562316632653762386164633531 +62613530343237343930316533353162353462316361646665363564383965633039346266386565 +62613763353837326139663638343965376163336262336262363637646463633135633337616435 +32616537613037343632613434623162616334346538633930366235646364626133373138306264 +3162 diff --git a/ansible/roles/gitea/templates/gitea-compose.yml b/ansible/roles/gitea/templates/gitea-compose.yml index 4d29a64..b2cbbcb 100644 --- a/ansible/roles/gitea/templates/gitea-compose.yml +++ b/ansible/roles/gitea/templates/gitea-compose.yml @@ -30,9 +30,9 @@ services: image: postgres:9.6 restart: always environment: - - POSTGRES_USER=gitea - - POSTGRES_PASSWORD=gitea - - POSTGRES_DB=gitea + - POSTGRES_USER={{ GITEA_POSTGRES_USER }} + - POSTGRES_PASSWORD={{ GITEA_POSTGRES_USER }} + - POSTGRES_DB={{ GITEA_POSTGRES_USER }} networks: - gitea volumes: diff --git a/ansible/roles/gitea/vars/main.yml b/ansible/roles/gitea/vars/main.yml deleted file mode 100644 index 0b9cc33..0000000 --- a/ansible/roles/gitea/vars/main.yml +++ /dev/null @@ -1,7 +0,0 @@ -GITEA_USER_UID = 1000 -GITEA_USER_GID = 1000 -GITEA_DB_TYPE = postgres -GITEA_DB_HOST = db:5432 -GITEA_DB_NAME = {{ VAULT_GITEA_DB_NAME }} -GITEA_DB_USER = {{ VAULT_GITEA_DB_USER }} -GITEA_DB_PASSWD = {{ VAULT_GITEA_DB_PASSWD }}