Bump gitea-runner

ansible/README.md

@@ -9,25 +9,26 @@ To drop into a shell with `ansible-*` commands, run:
 nix develop
 ```
 
-## `misc.yaml`
+## `nanna-setup.yaml`
 
-Server for miscellaneous stuff, e.g. the website.
+Small VPS for self-hosted services.
-Expects to have a user `paul who can `sudo`.
+Expects to have a user `paul` who can `sudo`.
 Sets up:
 
 - Some basic packages
 - Docker and `docker-compose`
 - Nix multi-user installation
 
-## `misc-docker.yaml`
+## `nanna-docker.yaml`
 
-Deploys Docker configurations from `../docker`:
+Deploys Docker Compose configurations from `../docker`:
 
 - Sets up the docker network `caddy-network` for services that are reverse proxied by caddy
 - Copies configuration into `/etc/pbri/docker`
 - Creates folder `/var/lib/pbri/docker` for storing application files
 - Creates users with `42xxx` UIDs for running containers
+- `docker compose {up,down}`s all enabled/disabled services
 
-## `misc-sites.yaml`
+## `nanna-sites.yaml`
 
 Checks out static sites into `/home/paul/Sites` which is mounted into `/srv` in the Caddy container.

ansible/playbooks/nanna-docker.yaml

@@ -67,7 +67,7 @@
         - path: factorio/.env
           state: present
         - path: hitparade/.env
-          state: present
+          state: absent
         - path: hitparade/pollmaster-config.yml
           state: present
     # This needs to be done for any services where user:

docker/docker/Caddyfile

@@ -0,0 +1,90 @@
+{
+    admin off
+}
+
+pbrinkmeier.de {
+    file_server {
+        root /srv/pbrinkmeier.de
+    }
+}
+
+files.pbrinkmeier.de {
+    basicauth {
+        wug JDJhJDE0JEJrQXUzVWxFZ2JGVmx6YlZWTkpYdy5IMjRXdnZZdGw5SjZDcUg2ZWMxOEVjcEV6dWhIRmhD
+    }
+    file_server {
+        root /srv/files.pbrinkmeier.de
+    }
+}
+
+dt.beany.club {
+    file_server {
+        root /srv/dt.beany.club
+        browse
+    }
+}
+
+vorschlagzumklangvongeschichtsschreibendenprozessen.de {
+    file_server {
+        root /srv/vorschlagzumklangvongeschichtsschreibendenprozessen.de
+        browse
+    }
+}
+
+tichy.click {
+    file_server {
+        root /srv/tichy.click
+    }
+}
+
+codi.pbrinkmeier.de {
+    redir https://pad.pbrinkmeier.de{uri} permanent
+}
+
+pad.pbrinkmeier.de {
+    reverse_proxy codi:3000
+}
+
+git.pbrinkmeier.de {
+    # Allow apps to requests tokens 'n stuff
+    @oauth path /login/oauth/*
+    header @oauth {
+        Access-Control-Allow-Origin "*"
+        Access-Control-Allow-Methods "GET, POST, OPTIONS"
+        Access-Control-Allow-Headers "Content-Type, Authorization"
+    }
+
+    @oauth_preflight {
+        path /login/oauth/*
+        method OPTIONS
+    }
+    respond @oauth_preflight 204
+
+    reverse_proxy gitea:3000
+}
+
+plantuml.pbrinkmeier.de {
+    reverse_proxy codi_plantuml:8080
+}
+
+utoy.beany.club {
+    reverse_proxy utoy:3000
+}
+
+vrnp.beany.club {
+    reverse_proxy vrnp:8000
+}
+
+fz.beany.club {
+    reverse_proxy yore:3000
+}
+
+beany.club, www.beany.club {
+    file_server {
+        root /srv/beany.club
+    }
+}
+
+qr.beany.club {
+    redir https://beany.club{uri}
+}

docker/docker/caddy/Dockerfile

@@ -1,4 +1,4 @@
-FROM caddy
+FROM caddy:latest
 
 COPY Caddyfile /etc/caddy/Caddyfile
 RUN chown 42002:42002 /etc/caddy/Caddyfile

docker/docker/codi/README.md

@@ -6,5 +6,3 @@ CODI_DB_USER=...
 CODI_DB_PASSWORD=...
 CODI_DB_DB=...
 ```
-
-See also: https://docs.drone.io/server/provider/gitea/.

docker/docker/codi/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   codi:
-    image: hackmdio/hackmd:2.5.4
+    image: hackmdio/hackmd:2.6.1
     user: hackmd
     environment:
       # Admin stuff

docker/docker/gitea/Dockerfile

@@ -1,3 +1,3 @@
- FROM gitea/runner:3.0.0
+ FROM gitea/runner:5.0.0
 
  COPY runner-config.yaml /opt/runner-config.yaml

docker/docker/gitea/docker-compose.yaml

@@ -63,7 +63,7 @@ services:
 
   gitea_runner:
     # Make sure to keep this in sync with the version in the Dockerfile
-    image: pbrinkmeier/gitea-runner:3.0.0
+    image: pbrinkmeier/gitea-runner:5.0.0
     build: .
     restart: unless-stopped
     environment:

docker/envs/caddy/Caddyfile

@@ -1,98 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-36363035616130303139633735336435323835383564386238336334366462666535326335636237
-3362343830383135633564666337383866653531383762370a333366646136336436346166326139
-65633935626565393264623066316262656261623435363563383961333462643165303937393262
-3036316461313138350a316465376133313233653762363235383864626238343539333939333832
-33313162343061376161626562323338613662336133633963366335373532653332623334313162
-35316366313939336239646633343430646331373263623033383761306462343733623866313632
-30323030313437386133383231613236663762333862376137366238623236306330623739653563
-65623930646466616638616337343830643934323836623761633361323836333461386234313535
-62313065623337366461376665323833326239303539363961396366343736623930333637613835
-37623639643730373132363034326565346234643239333266356236623264663263336637396662
-32353437386333313465313738616663343161663362663736663664623034316534313331653030
-37353432663733383363353462313032363634396133623730393661646536336532663237646230
-37316136383139323134373837373437393961373633653230323062336666313963656563366436
-30313338333665626264343537626366653433306239646264326630353637646630653039363833
-61343732313530633831316236383632616461333662356262623830373231383939613962363862
-37616438373761633631383036343135313166323439333331336234343662663163393032343939
-34663734336639653332653538306565323061623963373863613130636466613231326137316635
-31373765306161366265353030323261306663316633356434356137303237343936376330356136
-63303335333139326562363461346437626638366135383836636634303564393433303265303133
-35633432396638636637396365626131623364373061616164323831656366306165383236333761
-34646635316334333161663639396463633262663933616633633436666638656338623732653264
-64656637313436616266373833643763333662376162363437363138326263316366316163323331
-65656662396630303634653931666136356361626332363532643635666263313737336666313131
-34623163636261386361393732353863656531343265623361633736613834313236336232656534
-33316162653531333733313438333536396461323263353031393039383161376338666466643562
-64653031623263353332613536613932393762313132343864366566373433613932653637353365
-38393262613562613931313236643564313334306561376436653931303264633635336465376630
-36653466333063663962633664656338663466643632336561303364636266306437666165633665
-65343439353238396139653663346338393630356331653132623639666337363139663163633235
-66663836643531303838656163646134393337663230636634306464323539313430333131386261
-66393639393338386337613361313366303462616535623230643161323663666139623461303862
-65356430383564343535373764616666646638363635616236666131613462346562376435616466
-61363134363130306464316232306333353134333366396436646530306666626336663265386530
-30353763393565313139313838353433613637373066626130623163643637613064633166623063
-63336132623935643534656362643764666661323733656664323861663835323562656162376639
-30663237636537656364636139376236306265633461333132633332636536636566393130383266
-61323435303431393462646536326634316634636133353037663765616433663138656666376538
-39356130623332363363393662613931393535366534636130633366633136383335303535336661
-36326633643530656439346637363033623431386139363731333132323330613563313337646538
-34376139643935663139313439383435323939353139396433613439376234636463313633626362
-63343762613530353536303138666430326637643861333431656436646436326462306434613033
-39643232633461353131663632303461633762363164373961356161396161636430343363363039
-35333639363661623832646535363765353638343963346464616562653362363166646264393964
-63643538303937316132653235323961363663356137306562336632613638643865323636373731
-33636632366132363431396139343931363833303434353832653030373637633936326433323431
-63393639316466356435626466323963313839363830356537646232613138343134656262636435
-61663766623038633133383162646163633435666631303232346531363531663333646234333564
-61666366643363303765663838666439313537383463316433333061383962363537376661613064
-61306138623765633637613833313537373038366238313066646564646362646135333364663036
-63623861616534393936653537353435633562373939633039306236376263376631643965333133
-61353934386161636537383434626465613533333464643766613662643030656232383365643661
-35303435326335316431626135643531653865646235323565626661393535363034333562393666
-61333031653336333264653536356364663565323937346439653536303662613235376231396537
-65343931353061326437376463383839333731653766333435626566613133393732316666343837
-32373733643332376635386338353531306564633735343638383036356638336539346131623862
-38356636393634383162646463313062306363666434303737306333636539356361343261626133
-66386239663338613561386239626234303831313433353065306264306665323636393434326132
-37343266383062616337333265386633646664633866316337306435343732616538323761646130
-64333531343266663066623132333866613362646163396539386536306266393162373564633830
-61623365356666353033393661626337633031636135383063316436623333623837323461656437
-62626333613738386562306232613631643239326437316639643362623666306566303564336132
-64643161313130626163343630363531363936313962663361613131633763353739363536323263
-65303262346531323339326431306564633665616566373235663430306139343364366436326363
-38633862363837623361633239616537316336643335633732336433666662336139333036393339
-32373233306161616632383266656133363937646235373132643731636631353233376336616663
-61643236386535663737613138393134393866383736373566653836633564386261613365646566
-37626633326131323837613530303935326663666333386439613334616666663166383063393063
-37386364653265643036653964303731373335656662396363363032643963333239353336633565
-63376632376635383132383733656532383639623161343766343966333937646162303334643634
-66646237396633636333613638636566373364626230383438306334626636393261323130636635
-63613136353638303264313366373965653735623962636164303062383663653631613038613839
-64323438643965623035646166363932393835626365616166653838656537616334653633376564
-38353265343637616364386164396465356664346534653633623337343434636435353931663037
-38383233633463393833396665323536336661653732303033363035323839333565383631333164
-35383432646436343637336130393461613434613136636336636162613763656333393134316430
-66656561313331623131666434626132643863303562366332663232346333363835336137663831
-32643436616431373730316163346133663434313738633439306638613561373064636566343236
-65653637666535376339636565623163663365383262666336343963316461333962633030393139
-33633735393034633332663565373032313962636532383462633334316431636439393133373464
-34663831333438333663336631373763396634336361313834616239663366663865613334343438
-32633065643536316338393237663237643434666339343136663135626339323235366134663330
-66313732643633646630333965613061313337613936356335316134623162353736646638636137
-35326361383465646362313765613762373963613836346332313134613336336362346662343731
-31396163396566373863336363313632636336343939643333326431303366643532313830306666
-62663037643137333066383164386436656564333439643932343061643137323535343564666164
-65356530633463386132636136633463646361643830653364363132316565353138366164373935
-36393566666537656637633566613438663563653564343136306263306263333439386262326633
-62343230306130323236613331623466396164663234653133626231396566336231623632363463
-32376663303564313230343738303234323430323436633335333962396661353333636162333635
-39633835333033336461643166313538326434633264653131643365386439313963346336396466
-37303763633331383336313336316266373739396335656466313332386535666561626332376234
-37653361363465616363333134326638393438323063613163356230393866626664386461343136
-39306263653633643036383934326139303434363437373061376561313161373033643537626162
-38653965333135653039323966376430323462353561633732643737303366316461373035383437
-61633362393566383034616238613262613762323861303663623665623636353637313633653666
-30376330366438396362356330343537346136366361613133643435643736363334393166623863
-3762