fix: various minor bugs

servers/skel/docker-compose.d/custom/nginx/Dockerfile

@@ -9,4 +9,5 @@ COPY conf.d /etc/nginx
 COPY nginx.conf /etc/nginx/nginx.conf
 
 COPY entrypoint.sh /entrypoint
-ENTRYPOINT [ "sh", "/entrypoint" ]
+ENTRYPOINT [ "sh", "/entrypoint" ]
+CMD [ "nginx", "-g", "daemon off;" ]

servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf

@@ -18,6 +18,8 @@ server {
     listen 443 ssl;
     server_name localhost;
 
+    # SSL will be managed by certbot, no need to insert SSL config.
+
     location / {
         proxy_pass http://$host$request_uri;
     }

servers/skel/docker-compose.d/custom/nginx/entrypoint.sh

@@ -3,6 +3,7 @@
 trap exit TERM
 
 if [ -n "${CERTBOT_DOMAINS}" ]; then
+    sleep 5
     echo "registering domains..."
 
     certbot --nginx -n --agree-tos \
@@ -12,11 +13,10 @@ if [ -n "${CERTBOT_DOMAINS}" ]; then
     while :; do
         echo "renewing domains..."
         certbot --nginx -n renew
-        nginx -s reload
         sleep 12h & wait $!
     done &
 else
     echo "skipping certbot due to no domains!"
-fi
+fi &
 
-exec nginx -g "daemon off;"
+exec "$@"

tools/repo/setup-server-folder.sh

@@ -3,5 +3,6 @@
 if ! [ -d "servers/${1:-$HOSTNAME}" ]; then
     echo "setting up servers/${1:-$HOSTNAME}..."
     cp -r servers/skel/. servers/${1:-$HOSTNAME}
+    sed -i "s/localhost/${1:-$HOSTNAME}.ixvd.net/g" servers/${1:-$HOSTNAME}/docker-compose.d/custom/nginx/conf.d/default.conf
     echo "server configuration for \`${1:-$HOSTNAME}\`." >servers/${1:-$HOSTNAME}/README.md
-fi
+fi

tools/setup/05-install-packages.sh

@@ -7,5 +7,6 @@ if grep -q "debian" /etc/os-release; then
         cifs-utils \
         restic \
         docker.io \
-        docker-compose
+        docker-compose \
+        apparmor
 fi