From a6565057fbe71db4a22221f1d6ebb9b686521fd6 Mon Sep 17 00:00:00 2001 From: Corbin Bartsch Date: Wed, 2 Apr 2025 22:10:12 -0400 Subject: [PATCH] Add nginx container --- .gitea/workflows/build_hugo.yaml | 5 +-- ansible/group_vars/all.yaml | 5 +++ ansible/roles/requirements.yaml | 1 + ansible/run.yaml | 1 + .../whatnow.site/01-traefik/compose.yaml | 5 ++- .../whatnow.site/02-nginx/compose.yaml | 6 +++ ansible/vars/vault.yaml | 42 +++++++++---------- inventory.yaml | 2 +- 8 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 ansible/services/whatnow.site/02-nginx/compose.yaml diff --git a/.gitea/workflows/build_hugo.yaml b/.gitea/workflows/build_hugo.yaml index 6f9b13f..10e3ef8 100644 --- a/.gitea/workflows/build_hugo.yaml +++ b/.gitea/workflows/build_hugo.yaml @@ -11,8 +11,7 @@ jobs: build-hugo: runs-on: ubuntu-latest steps: - - name: Check out repository code - uses: actions/checkout@v3 + - uses: actions/checkout@v3 with: submodules: 'true' github-server-url: 'https://git.cbarts.net/' @@ -36,4 +35,4 @@ jobs: chmod 600 /tmp/act_runner_key - name: rsync public directory run: | - rsync -avz --delete -e "ssh -i /tmp/act_runner_key -o StrictHostKeyChecking=no" ${{ gitea.workspace }}/public/* act_runner@whatnow.site:/var/media/nginx/ + rsync -avz --delete -e "ssh -i /tmp/act_runner_key -o StrictHostKeyChecking=no" ${{ gitea.workspace }}/public/* act_runner@whatnow.site:/var/media/nginx/html/ diff --git a/ansible/group_vars/all.yaml b/ansible/group_vars/all.yaml index 166051d..0241c79 100644 --- a/ansible/group_vars/all.yaml +++ b/ansible/group_vars/all.yaml @@ -11,3 +11,8 @@ openssh_macs: - hmac-sha2-512-etm@openssh.com - hmac-sha2-256-etm@openssh.com - umac-128-etm@openssh.com + +# grog.package +package_list: + - name: tmux + - name: rsync diff --git a/ansible/roles/requirements.yaml b/ansible/roles/requirements.yaml index de91be7..8c10e2d 100644 --- a/ansible/roles/requirements.yaml +++ b/ansible/roles/requirements.yaml @@ -5,3 +5,4 @@ roles: - name: coredotbin.docker - name: oefenweb.fail2ban - name: ironicbadger.docker_compose_generator + - name: grog.package diff --git a/ansible/run.yaml b/ansible/run.yaml index a3c8508..337799b 100644 --- a/ansible/run.yaml +++ b/ansible/run.yaml @@ -4,6 +4,7 @@ vars_files: - 'vars/vault.yaml' roles: + - role: grog.package - role: coredotbin.openssh - role: oefenweb.fail2ban diff --git a/ansible/services/whatnow.site/01-traefik/compose.yaml b/ansible/services/whatnow.site/01-traefik/compose.yaml index 9cb0f65..0eeff5f 100644 --- a/ansible/services/whatnow.site/01-traefik/compose.yaml +++ b/ansible/services/whatnow.site/01-traefik/compose.yaml @@ -1,9 +1,10 @@ ---- - services: traefik: image: traefik container_name: traefik + ports: + - 80 + - 443 command: - --api.dashboard=false diff --git a/ansible/services/whatnow.site/02-nginx/compose.yaml b/ansible/services/whatnow.site/02-nginx/compose.yaml new file mode 100644 index 0000000..bb79e30 --- /dev/null +++ b/ansible/services/whatnow.site/02-nginx/compose.yaml @@ -0,0 +1,6 @@ +services: + nginx: + image: nginx + container_name: nginx + volumes: + - /var/media/nginx/html:/usr/share/nginx/html:ro diff --git a/ansible/vars/vault.yaml b/ansible/vars/vault.yaml index b41c07f..ee7cbdb 100644 --- a/ansible/vars/vault.yaml +++ b/ansible/vars/vault.yaml @@ -1,22 +1,22 @@ $ANSIBLE_VAULT;1.1;AES256 -34353531633562323465616266306433346332303237393662656330643764376263323261303161 -6138393630393663353436666462313661346235656433610a333466383033613338616666313835 -36633037373166313432643665303632396162633963643336356562666363353766663561323936 -3466323034323633650a393063363665303761363063373662326661343634323363353661383736 -30343835373730643436643961383964343733653861623430333863393935613930386635333962 -31636437346465643965326162373464376161393133633661333734303834326530316431383165 -62396537353061306561333761396336663263316230633636383138636131376233333662396335 -39393165363962653236636663613735323739613631656534353165383631623366303761653165 -66383862656165346330623730353066353939666265613037323335613939333630623763633439 -32373835366362373035343837343032613032393736626330366239373462316633393732326662 -33333861666138343464343137613461653030313132393462353034393238616532343762333232 -31616238663964363565363461623663626465383437663834396461376638383331346165323838 -38353365383136663438623330633730653533636634393435363931393361396132616263636535 -63653032323137376465623433333631663731393563626635316464343539663534306363303666 -66313430316535653963323038666437663536303334316233653132656230393032323238633838 -33643432383730346430303439663630643663396231366336383266343935306136316434343231 -31316536613265646231653930313230633234653265643763373364343464386435396338656366 -62323631663962333135393365626635343861393830373161396335653564356236653931663162 -61643036333835393964656662393834313031633162626665366237386365663962653733316639 -66633235623033663235343334653633386537356634616461616661653239346238383662656365 -6539 +64353662646335633331636539363935316531356565306432336563373636633135366163313837 +3934303363343739303238373939646134613232666332640a363930373562623638383965393961 +35376164376265333361633839343963383865653837323339353936313061623837633262396565 +3165306166643334650a356137666239316561336461323862663335653336666434383832323463 +37633032343030613862316239363361336131366434623863353835346536366530303633333730 +37386234383532343232366633313839636132316436333765393065393538363933643739656439 +32616331663033343233323633396530376437663964646163326237636161323831646265386662 +66353438386538666539386335313738353266366562393562613366353430356531386438323530 +31353938653339396130386131376238313762343065326638323531633635633132323330643563 +62363362366436393763666538656634633535613635393831316666326434373166653461386464 +37636536313266316566656236343131656661366337653064303235346262303461303364666630 +65666638353466383965613931363632663230303263356661383834373231623334643636633764 +35333766313834633633346134343833613866373339303662313337326230336538623762373162 +34613731376263373961313563343534393232623237376639393939383766363939336234373561 +32666335396261393563353234323761353732313239303161363435643634626633353433383034 +65616661383564323065613464316662383635633666363030343031386136336562326537623861 +30376165373939393464386366343734633339383936386365343230616234643533366237353530 +30366663336162633131326161366232646437316330323034343661643862653563633363343932 +30663666316533356361666365633936313436336530616235666330633937313731636230623835 +39396135383563393330633438373530636163616363623530613863656262383939613439613965 +6165 diff --git a/inventory.yaml b/inventory.yaml index da2fc4a..96ed54c 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -3,7 +3,7 @@ all: hosts: whatnow.site: ansible_user: act_runner - ansible_ssh_private_key_file: act_runner + ansible_ssh_private_key_file: keys/act_runner children: docker_hosts: hosts: