From 7f36507dce3d44c6b909bae264782be52f85f591 Mon Sep 17 00:00:00 2001 From: "M. V. Hutz" Date: Tue, 7 Oct 2025 22:39:58 -0400 Subject: [PATCH] feat: ansible proxy jump --- Taskfile.yml | 5 +- playbooks/deploy.yml | 8 +-- playbooks/provision.yml | 28 ++++++++ playbooks/restore.yml | 5 +- playbooks/runner.yml | 25 +++++++ variables.yml | 2 + vault.yml | 153 +++++++++++++++++++++------------------- 7 files changed, 140 insertions(+), 86 deletions(-) create mode 100644 playbooks/runner.yml diff --git a/Taskfile.yml b/Taskfile.yml index 11f59bf..9e46e48 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -18,9 +18,8 @@ tasks: - cp ./assets/logo.svg ./gitea/custom/public/assets/img/favicon.svg - cp ./assets/logo.png ./gitea/custom/public/assets/img/apple-touch-icon.png - - enter: + gitea: cmd: ssh -i {{.KEY}} -p 2222 root@{{.IP}} vars: - KEY: { sh: ansible-vault view vault.yml | yq -r ".secret.private_ssh_key_path" } + KEY: { sh: ansible-vault view vault.yml | yq -r ".secret.private_gitea_ssh_key_path" } IP: { sh: cat dist/terraform_outputs.yml | jq -r ".server_ip.value" } diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml index b9f8fad..98574d4 100644 --- a/playbooks/deploy.yml +++ b/playbooks/deploy.yml @@ -11,7 +11,7 @@ ansible_ssh_host: "{{ server_ip.value }}" ansible_user: root ansible_port: 22 - ansible_private_key_file: "{{ secret.private_ssh_key_path }}" + ansible_private_key_file: "{{ secret.private_gitea_ssh_key_path }}" - name: Switch port to 2222. hosts: server_fresh @@ -41,10 +41,7 @@ - name: Add remote host. ansible.builtin.add_host: name: server - ansible_ssh_host: "{{ server_ip.value }}" - ansible_user: root - ansible_port: 2222 - ansible_private_key_file: "{{ secret.private_ssh_key_path }}" + ansible_ssh_host: repository_gitea - name: Install Docker. gather_facts: true @@ -55,7 +52,6 @@ tasks: - name: Install PIP. ansible.builtin.apt: - update_cache: true name: - python3-pip state: present diff --git a/playbooks/provision.yml b/playbooks/provision.yml index 42525b0..0c998fd 100644 --- a/playbooks/provision.yml +++ b/playbooks/provision.yml @@ -36,3 +36,31 @@ content: "{{ terraform_apply.outputs }}" dest: ../dist/terraform_outputs.yml mode: '0755' + +- name: Update SSH config. + hosts: localhost + gather_facts: false + tags: hosts + vars_files: + - ../vault.yml + - ../dist/terraform_outputs.yml + - ../variables.yml + tasks: + - name: Add Gitea host. + community.general.ssh_config: + host: "{{ variables.gitea_host }}" + hostname: "{{ server_ip.value }}" + remote_user: root + forward_agent: true + user: user + port: 2222 + identity_file: "{{ secret.private_gitea_ssh_key_path }}" + + - name: Add Runner host. + community.general.ssh_config: + host: "{{ variables.runner_host }}" + remote_user: root + user: user + identity_file: "{{ secret.private_runner_ssh_key_path }}" + proxyjump: "{{ variables.gitea_host }}" + hostname: 10.0.10.17 diff --git a/playbooks/restore.yml b/playbooks/restore.yml index 0e58481..843bd1b 100644 --- a/playbooks/restore.yml +++ b/playbooks/restore.yml @@ -8,10 +8,7 @@ - name: Add remote host. ansible.builtin.add_host: name: server - ansible_ssh_host: "{{ server_ip.value }}" - ansible_user: root - ansible_port: 2222 - ansible_private_key_file: "{{ secret.private_ssh_key_path }}" + ansible_ssh_host: repository_gitea - name: Deploy artifact to instance. hosts: server diff --git a/playbooks/runner.yml b/playbooks/runner.yml new file mode 100644 index 0000000..e0fb47a --- /dev/null +++ b/playbooks/runner.yml @@ -0,0 +1,25 @@ +- name: Set up for fresh host. + gather_facts: false + hosts: localhost + vars_files: + - ../vault.yml + - ../dist/terraform_outputs.yml + tasks: + - name: Add remote host. + ansible.builtin.add_host: + name: server + ansible_ssh_host: repository_runner + ansible_ssh_extra_args: -J repository_gitea + +- name: Deploy runner. + hosts: server + gather_facts: false + tasks: + - name: Test + ansible.builtin.raw: hostname + register: test + changed_when: false + + - name: Debug + ansible.builtin.debug: + var: test diff --git a/variables.yml b/variables.yml index e684b58..a6dd988 100644 --- a/variables.yml +++ b/variables.yml @@ -1,2 +1,4 @@ variables: image_name: mvhutz/gitea + gitea_host: repository_gitea + runner_host: repository_runner \ No newline at end of file diff --git a/vault.yml b/vault.yml index bf0b389..649557b 100644 --- a/vault.yml +++ b/vault.yml @@ -1,74 +1,81 @@ $ANSIBLE_VAULT;1.1;AES256 -61373361343465653331373864653237343663666166623530343735353531353131303961646538 -6237323535366138393163646464663866663731386334360a643263636135303434313765323534 -65613439663138656462353936366434303862353533616135636134363631353866626164623961 -3431636431333061360a643163323166643635353332336534663564613538643730323665356631 -39653538343764613130363664636431646339393236383238336364353832356238666362653165 -36623236393966376136396237383561333735386661636266326538353765373135303565386439 -35383539653438386131656661353135633132383261656439393532613831643535373639666366 -35616165343038366139646431326562323362623562346631303335346633356166613062343838 -38643961633438326666613436613339663761316533633935306332323135653266653030653763 -61623433656538653933643037356334393334383238383934633963343533613736363965643633 -31636235333032303633396638326266383634383234646139313332356539303536373330633632 -37666636393661653738383931373237326366373836336662363931616235643633636366393565 -38386564323633616531396164316363626361393636383363383463643431386564623666333636 -30663438306462326132656261323730306630303936383563353134346136643637616164363638 -66656331333037366132366534353138336334363863383437313431346333616164313033653666 -38373061356639653533646136386163303334356365303963663730633234653762653137373438 -39616261656133316565363337656164386231623236613833356232346235646539636233333664 -66393337373663306637386638373565613338393133336662326338373636383439623365343865 -35396134323839336630396532306266316261613365316132333662306562656336363336373936 -62346266623230636363303834323865336432656565343161653661636462313635613238363865 -33363937386464363364656662633933386161653933326630663339633064326164353064366462 -66316661303333363661663134306237376233306665646636306330376134323937313539626532 -61376230666261636337363535636639323761386163383133376638393364343861363734643866 -66313661623834616637346637656136623965346339306136343232366262356262313030343865 -62656565386630333936663535323636376436333665613366326430386437396663616633373431 -38613239313362336263323866646234383661303834663561373137613035623863336332623761 -32376236373536373839666537376464353330636363653934653139646233316139393535343037 -66343036643431353237363639363539666164383665373463373631646162363735646466646233 -66663033343232636464333561336436366330363234643535376563636431373235373737333265 -61336335633461313764663064653336356434386334303239656265363033623830616238626237 -63666531626362666536346138663234363031383934323430616530343961343939323532663634 -66373337366564303933316138343662333538313439646332306237316134306238346263333666 -35656661306439323136653130353338386362343830323564316636326230626662366234373233 -66313837316262383334346535363865643235666436643865303835346665663034316338393764 -61366233306537343531623365333636666235366535633863353239613765323630303637313237 -62613634646131363762633435333163636439306161323761393835343239303836353563636262 -63633564356664643761623632623664303066326163613461613731326336646334646134613462 -63343363323437633261623861643563656430663433653863386636323530353561343738353866 -61393363616432336365653065633265336463316234383863386437383463653430363938323630 -65303739393765666464613331336465633737323439666161396334643965666632346139306533 -31646339653835663139316231336235386661363038623435356662373764313335323262376331 -32363766313830653935313137373561623531396539343632666537366635353065353531303930 -64366432343837333962316334653334633333343661663765376132383733393831323366333130 -36353436653833356432393635643032356163386138636431343264366263376662336335306230 -33393965346639393162366439323662343631383535313638356336376536383732626333613162 -32653235393736633664323463383630323932363864333862336132343832323239316363623366 -32333664363361356264376633313433643733623930303666623237346261653034373964373133 -61623465373032633434663936353639323036346565623262336237616163353462303033666662 -31393963633539393532376130396261383563386661623161386239306434393432613133363564 -34316437386533313738346361333534393637653736393366383966636364663362653032656530 -31643432343331383237646266363338316439363535373366346431333264323264383432313265 -39373031353333306233373133363231306163363836353232653066653564373362366566373739 -38626466333038663439626264613961313932356231346264313438616234383335646239306633 -34366233383962653764626533363035643039623537626366363636616333393238336537313534 -62363631653133363966376132653638343638393639383465376562316462626462633963316135 -64313565646663363537616364633433343935376338636433336132353465613432393164656537 -32663732396263393739323937323734653830353932383162383461343231343865316465303763 -38336261306139356234363938316337336461373836616238333938373233626461616461643035 -62656437343831663931343662616634666263316561343562313461346266373531643530376661 -30636133323437306566336339343637333035326637376338313765666332616361303636393332 -63653437333062386435346566666262623132633932666333653233616139363834356639643131 -34303134323939626630323539666166313230376331656630663933376138323935633139613737 -31643136303934306634383266636534396135663265666161333465633238363665393865336337 -34353336366230313366363432373031343533316666343665646131343236326232643439663761 -30376663616564323737343234666532326163336163376461666665313762316531306233326365 -37333938633561666233393333323634373762303536356438646235653830363837376336623238 -62333837376466623733303764323432316532336534373537303433373331373234643963356331 -63636636626135393031636664323534666239356665663437313435613438666163396131623263 -39666533393464356663363531373063626365386230636330613633643534306531373637343264 -64353163383962616530333264303238363666613139636562636263633664366564663633666665 -35326565366237623835643635636636376133306230393437326234333838326431333430643665 -31313339623739383736373065343463343835383965363537613832343764396231333930616264 -3337 +34666138303266383336633235633037626261343833333763333463373261376165393735313230 +6133336466363137653966393733373236373161663434350a356634326634346530336632653535 +66386136393434616639626634376236656666656362346130343964356536393634616165303531 +6636396336303361320a353135303264313361373762303466383731313266666635316566383630 +33363332623266343834633962663837383433303034336661633235616565333837623064396137 +65373761343937666430336137656465643962336561346630626638343064306330323636366234 +38363035323061663266663466336638366236346162373338396538333637613834353235613061 +38313339353262643232613832623963376638643439666333333031356162303834363933313833 +35336332316337353936313963343636636464656639313930613133333866303933336635663737 +65663237663865313566666133666161626539376463363439313365333366323561653666616533 +61383334383230663330326236366262323464633432613562313239613031666261626334323666 +61616534343436356631383764383139386630656165376461313432643136653463306435353261 +65313363383339353434663139303961393865353230646138633161626235636437636135653763 +30313736366263303866313466333464303666396334643531343734623562636439616239663737 +32653536646234343435376365623466346131353262663261653438666137386662326332343263 +38343966373931326232393838613763653731383038373338353863303264366162373966613563 +36363137636236643663373837383161386266313963363437663835663037316230373466643466 +61353931653031313133393163353639373736636139366430653865663335303230306662393632 +30666435633434656434313736323732383135383638383334393433333530646661396232383635 +35363430313837373136643230386666623436383239336339623565356630303766333832306261 +63396565623164633466356437316233386561313932626262613162326332306638363130613533 +62363665363032646565643036636233323966373362663163373165323934383263316232323965 +39663733346637663735613434326239633337613933633765306261616363396465623565346136 +35336333363461653163343436633963343830306264333665393338363039636139343934353361 +39613664383134663766623165386266623661356230396535346166653761633831663566366339 +65353933663861333539336130633262303038633639333137313232363535636531353435303635 +39306433633261303634616533666230396566616131363435383662363432613634386266373966 +38323933303164323565326534326364646562316539643132616364646137323735373236633637 +36646337356333643766393464626633643263313437343932306634363532626563646163353661 +65636461663736663136366462346462633065313763666532303532366538386239383465323966 +36333465313338613635373336306266643862623262306237666235633532373163356630303163 +32353563623162303465376237313264646132656565313335653964323233636562613664316538 +32383737316362356365613064393662316434303932643136313866326235636632353135373735 +38656536623134623263656338356436656137313563353366666366643535393662356433376237 +30343961653363376162626333323261316635333366366131343136383362386131396466383662 +32393361383534636662663439363630663064383834363036396463383362666637646436326462 +36653734353036613139653462363563613635643166333262623533316330666166613239613136 +30366662333666653038303035323163323438323535366339646539323063373761346337373163 +63393833373663356635646236616564353936366437633766616333656538366263353664363031 +65303462623737323638326661326134303635353065323666616331323933646531376239626630 +35383232316666643166646232383837646262306331663337663961653861613536616632663764 +39326331373633336661346133316434623434306636643839306136363734353330663237366564 +32353237306633626564633034383466306239323833343838316638663065323834666438666135 +36643832646434633262393634333264333964383433643866356232613536396339353536346538 +62383832393033336133346435303463626165643463326538353864343565373830636635663237 +38653239393061353334326662633735643238333231663437343238613730383937363834623664 +37363661636230636632383331613264383064366238396163373838343062646432653462616635 +38313835333437653734336162326662346466633533623565376262653134373730356337623165 +62376464623438343165323037653631326565613737313062666232663130643638643165343466 +30636261343730366233643634643963363061346361663732663336393239623934313561626461 +33636365383863343138343964303630643463633732623462636465323464353063353134636430 +37653764396236386233313766393339323735623139633966336237363061326431636566376137 +30366636663235613136303462363035623135636461343638323266663661616335326332353034 +62333130373830613363396331613336616531313064356165613930373230383234363561346632 +64346635646338356430313536353436626265383561643166346561356430663238636561653363 +62386365363466663931333663373737646563363639356161613464373534643965653236356639 +63636237666332643966353131656435613933663230363665376333346563616634316430373235 +33643738326164656664643730376266666236333631393634356133633432373031613030663464 +61613964346133663638623038323161316665653436306533633438383563333465643731373537 +64333531653437373531306631363533643736326462343138323739356463383465626638626164 +62653862643032356264396461363530346633336230326166323563323830646464656633356430 +33323163626633303639613138343765626633323563303236396164376336396362306265363365 +38663237323533336263323636643536343963346337313938343262323366666130383339323337 +31396361316438333262656231356566363635343465383265633133343338376363303962343131 +34363537643731633735663635653163386264383334366134626230396439666439313963373934 +38373237383239336333656235613963623766343565653865623861353735366638356137313161 +63643735656463633063386239383961663230326665616233343634366531623561613732393131 +34623665333866343962306234623538306234653264373534633062363263653638303736666537 +32383832343939353438663738636537333834383934666536303233313763616434373663313737 +65313465313161656565376532386564646435373062313964633033616564393632623338666261 +62363034643363303337353565326438313832636165316363393238353531383837616337366530 +36663733376436336639633431313263373337313239303563313962663361653633356637616239 +64616665623563656137313537346238393432636235326164303165303136356264646634623438 +61633334303539616366653763383134643764323735333163353036373961353738386630643030 +61333861316565363536386465316637613065356235633335363834613733386130343132363130 +33663866656163386265303163613164303538333462343233343930346261663430383038343833 +34666439633562356633633666653338396131383531666238383962613737376531376638643265 +34313464313136356532313439616365386133653334383266383564333562663366386631656663 +37643837336138336237336462393937333437623665323063383464353662653865343433613164 +36346433653537656264