Merge branch 'development' into tests_systemd

Signed-off-by: Christian König <ckoenig@posteo.de>

.github/workflows/test.yml

@@ -55,7 +55,6 @@ jobs:
             ubuntu_22,
             centos_8,
             centos_9,
-            fedora_35,
             fedora_36,
             fedora_37,
           ]

advanced/pihole-admin.conf

@@ -79,4 +79,4 @@ $HTTP["host"] == "pi.hole" {
 }
 
 # (keep this on one line for basic-install.sh filtering during install)
-server.modules += ( "mod_access", "mod_redirect", "mod_fastcgi", "mod_setenv" )
+server.modules += ( "mod_access", "mod_accesslog", "mod_redirect", "mod_fastcgi", "mod_setenv" )

automated install/basic-install.sh

@@ -1442,7 +1442,7 @@ installConfigs() {
             fi
             chmod 644 $conf
             if is_command lighty-enable-mod ; then
-                lighty-enable-mod pihole-admin access redirect fastcgi setenv > /dev/null || true
+                lighty-enable-mod pihole-admin access accesslog redirect fastcgi setenv > /dev/null || true
             else
                 # Otherwise, show info about installing them
                 printf "  %b Warning: 'lighty-enable-mod' utility not found\\n" "${INFO}"

test/_fedora_35.Dockerfile

@@ -1,18 +0,0 @@
-FROM docker.io/fedora:35
-RUN dnf --setopt=install_weak_deps=False install -y git systemd
-
-ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
-
-RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
-ADD . $GITDIR
-RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
-
-RUN true && \
-    chmod +x $SCRIPTDIR/*
-
-ENV SKIP_INSTALL true
-ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
-
-CMD ["/usr/sbin/init"]