Switch to upstream certbot container and run hostapd on host

containers/certbot/Dockerfile

@@ -1,7 +0,0 @@
-FROM alpine
-RUN sed -i s/v3.18/edge/ /etc/apk/repositories
-RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
-RUN apk upgrade
-RUN apk add certbot certbot-dns
-COPY run-certbot /usr/local/bin/run-certbot
-CMD sleep infinity

containers/hostapd/Dockerfile

@@ -1,5 +0,0 @@
-FROM alpine
-RUN apk add hostapd
-RUN chmod 777 /etc/hostapd
-COPY --chown=5000 hostapd.conf /etc/hostapd/hostapd.conf
-CMD sed s/REPLACEME/$PASSWORD/ -i /etc/hostapd/hostapd.conf && hostapd /etc/hostapd/hostapd.conf

home/etc/containers/containers.conf

@@ -1,4 +0,0 @@
-[containers]
-dns_servers=["192.168.255.1"]
-log_driver="journald"
-read_only=true

home/etc/containers/systemd/hostapd.container

@@ -1,12 +0,0 @@
-[Container]
-Image=git.strypsteen.com/mathieu/hostapd
-Network=host
-User=5000
-Group=5000
-NoNewPrivileges=true
-AddCapability=NET_ADMIN
-EnvironmentFile=/var/lib/container-data/hostapd.cfg
-Tmpfs=/etc/hostapd
-AutoUpdate=registry
-[Install]
-WantedBy=multi-user.target

misc/vscode.json

@@ -11,16 +11,19 @@
   "editor.selectionClipboard": false,
   "editor.smoothScrolling": true,
   "editor.tabSize": 2,
+  "explorer.confirmDragAndDrop": false,
   "files.autoSave": "off",
   "files.enableTrash": false,
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
   "files.trimTrailingWhitespace": true,
+  "git.confirmSync": false,
   "github.gitAuthentication": false,
   "search.smartCase": true,
   "telemetry.telemetryLevel": "off",
   "window.menuBarVisibility": "visible",
   "workbench.colorTheme": "Default Dark Modern",
   "workbench.enableExperiments": false,
-  "workbench.settings.enableNaturalLanguageSearch": false
+  "workbench.settings.enableNaturalLanguageSearch": false,
+  "workbench.startupEditor": "none"
 }

server/etc/containers/containers.conf

@@ -1,3 +1,2 @@
 [containers]
-log_driver="journald"
 read_only=true

server/etc/containers/systemd/certbot.container

@@ -1,7 +1,10 @@
 [Container]
-Image=git.strypsteen.com/mathieu/certbot
+Image=docker.io/certbot/dns-cloudflare
 Network=certbot.network
+PodmanArgs=--entrypoint=sleep
+Exec=infinity
 Volume=/etc/certificates:/etc/certificates:z
+Volume=/var/lib/system-config/container-config/certbot/run-certbot:/usr/local/bin/run-certbot:Z,ro
 Tmpfs=/etc/letsencrypt
 Tmpfs=/var/lib/letsencrypt
 Tmpfs=/var/log/letsencrypt

setup-home.sh

@@ -2,7 +2,7 @@
 set -e
 cp -R home/* /
 sh setup-server.sh
-rpm-ostree install --idempotent systemd-networkd wireless-regdb
+rpm-ostree install --idempotent hostapd systemd-networkd wireless-regdb
 systemctl enable --now nftables systemd-networkd
 systemctl disable --now NetworkManager
 systemd-tmpfiles --create