various minor fixes

.gitignore

@@ -12,6 +12,7 @@
 /data/reg/servnest.test.zone
 /data/reg/test.servnest.test.zone
 /data/tor-config/*
+/data/tor-keys/*
 /logs/sftpgo/sftpgo.log
 /logs/php/error.log
 /logs/cronie/*.log
@@ -22,3 +23,4 @@
 /sock/knot/knot.pid
 /data/knot/confdb/*.mdb
 /data/knot/servnest.test.invalid.zone
+/tmp/tor/*

apache.Containerfile

@@ -1,5 +1,5 @@
 FROM servnest_alpine
 RUN apk add apache2 apache2-brotli
-RUN chown apache: /var/log/apache2/ /run/apache2/
+RUN chown apache: /run/apache2/
 USER apache
 CMD ["httpd", "-D", "FOREGROUND"]

compose.yaml

@@ -73,7 +73,7 @@ services:
     volumes:
       - ./core/:/srv/servnest/core/:ro
       - ./core/db/:/srv/servnest/core/db/:rw
-      - ./conf/php.ini:/etc/php82/conf.d/servnest.ini:ro
+      - ./conf/php.ini:/etc/php83/conf.d/servnest.ini:ro
       - ./conf/php-fpm.conf:/etc/php83/php-fpm.d/servnest.conf:ro
       - ./conf/sudoers:/etc/sudoers.d/servnest:ro
       - ./conf/certbot.ini:/etc/letsencrypt/servnest.ini:ro

knot.Containerfile

@@ -1,7 +1,4 @@
 FROM servnest_alpine
 RUN apk add knot
-COPY install/knot.conf /
-RUN mkdir /run/knot /var/log/knot/ && chown -R knot:knot /run/knot/ /var/log/knot/
 USER knot
-RUN knotc conf-import /knot.conf
 CMD ["knotd", "--confdb", "/var/lib/knot/confdb/"]

sha256sums

@@ -1,2 +1,2 @@
 150b314291d91f2c45cddccc65c144b5d3b7a06a47fe8fcd1d1379e26f8d8c56  alpine-minirootfs-3.20.2-x86_64.tar.gz
-72f6fc9b9ffa312cb4d3f379703c0d5830ea1326a1299d8cf9ec1e0040f73d7a  sftpgo-v2.6.2.tar.gz
+34b317d2095377ae2850e9be5920f83e479acf1e33bbf0b97097b70640b08612  sftpgo-v2.6.2.tar.gz

tor.Containerfile

@@ -1,3 +1,3 @@
 FROM servnest_alpine
-RUN apk add tor && chmod 700 /var/lib/tor
+RUN apk add tor
 CMD ["tor", "--hush"]