Rebase to 3.17, migrate to s6v3, switch to nginx

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SMOKEPING_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"smokeping"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.13
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,44 +9,37 @@ ARG SMOKEPING_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="ironicbadger,sparklyballs"
 
-# copy tcpping script
-COPY tcpping /defaults/
-
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl && \
- if [ -z ${SMOKEPING_VERSION+x} ]; then \
-	SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	apache2 \
-	apache2-ctl \
-	apache2-utils \
-	apache-mod-fcgid \
-	bc \
-	bind-tools \
-	font-noto-cjk \
-	openssh-client \
-	smokeping==${SMOKEPING_VERSION} \
-	ssmtp \
-	sudo \
-	tcptraceroute \
-	ttf-dejavu && \
- echo "**** give setuid access to traceroute & tcptraceroute ****" && \
- chmod a+s /usr/bin/traceroute && \
- chmod a+s /usr/bin/tcptraceroute && \
- echo "**** fix path to cropper.js ****" && \
- sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
- echo "**** install tcpping script ****" && \
- install -m755 -D /defaults/tcpping /usr/bin/ && \
- echo "**** remove default apache conf ****" && \
- rm -f /etc/apache2/httpd.conf
+  echo "**** install packages ****" && \
+  if [ -z ${SMOKEPING_VERSION+x} ]; then \
+    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    bc \
+    bind-tools \
+    font-noto-cjk \
+    openssh-client \
+    fcgiwrap \
+    smokeping==${SMOKEPING_VERSION} \
+    spawn-fcgi \
+    ssmtp \
+    sudo \
+    tcptraceroute \
+    ttf-dejavu && \
+  echo "**** give setuid access to traceroute & tcptraceroute ****" && \
+  chmod a+s /usr/bin/traceroute && \
+  chmod a+s /usr/bin/tcptraceroute && \
+  echo "**** fix path to cropper.js ****" && \
+  sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 80
-VOLUME /config /data
+
+VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,44 +9,37 @@ ARG SMOKEPING_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="ironicbadger,sparklyballs"
 
-# copy tcpping script
-COPY tcpping /defaults/
-
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl && \
- if [ -z ${SMOKEPING_VERSION+x} ]; then \
-	SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	apache2 \
-	apache2-ctl \
-	apache2-utils \
-	apache-mod-fcgid \
-	bc \
-	bind-tools \
-	font-noto-cjk \
-	openssh-client \
-	smokeping==${SMOKEPING_VERSION} \
-	ssmtp \
-	sudo \
-	tcptraceroute \
-	ttf-dejavu && \
- echo "**** give setuid access to traceroute & tcptraceroute ****" && \
- chmod a+s /usr/bin/traceroute && \
- chmod a+s /usr/bin/tcptraceroute && \
- echo "**** fix path to cropper.js ****" && \
- sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
- echo "**** install tcping script ****" && \
- install -m755 -D /defaults/tcpping /usr/bin/ && \
- echo "**** remove default apache conf ****" && \
- rm -f /etc/apache2/httpd.conf
+  echo "**** install packages ****" && \
+  if [ -z ${SMOKEPING_VERSION+x} ]; then \
+    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    bc \
+    bind-tools \
+    font-noto-cjk \
+    openssh-client \
+    fcgiwrap \
+    smokeping==${SMOKEPING_VERSION} \
+    spawn-fcgi \
+    ssmtp \
+    sudo \
+    tcptraceroute \
+    ttf-dejavu && \
+  echo "**** give setuid access to traceroute & tcptraceroute ****" && \
+  chmod a+s /usr/bin/traceroute && \
+  chmod a+s /usr/bin/tcptraceroute && \
+  echo "**** fix path to cropper.js ****" && \
+  sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 80
-VOLUME /config /data
+
+VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,44 +9,37 @@ ARG SMOKEPING_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="ironicbadger,sparklyballs"
 
-# copy tcpping script
-COPY tcpping /defaults/
-
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl && \
- if [ -z ${SMOKEPING_VERSION+x} ]; then \
-	SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-	&& awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
- fi && \
- apk add --no-cache \
-	apache2 \
-	apache2-ctl \
-	apache2-utils \
-	apache-mod-fcgid \
-	bc \
-	bind-tools \
-	font-noto-cjk \
-	openssh-client \
-	smokeping==${SMOKEPING_VERSION} \
-	ssmtp \
-	sudo \
-	tcptraceroute \
-	ttf-dejavu && \
- echo "**** give setuid access to traceroute & tcptraceroute ****" && \
- chmod a+s /usr/bin/traceroute && \
- chmod a+s /usr/bin/tcptraceroute && \
- echo "**** fix path to cropper.js ****" && \
- sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
- echo "**** install tcping script ****" && \
- install -m755 -D /defaults/tcpping /usr/bin/ && \
- echo "**** remove default apache conf ****" && \
- rm -f /etc/apache2/httpd.conf
+  echo "**** install packages ****" && \
+  if [ -z ${SMOKEPING_VERSION+x} ]; then \
+    SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add --no-cache \
+    bc \
+    bind-tools \
+    font-noto-cjk \
+    openssh-client \
+    fcgiwrap \
+    smokeping==${SMOKEPING_VERSION} \
+    spawn-fcgi \
+    ssmtp \
+    sudo \
+    tcptraceroute \
+    ttf-dejavu && \
+  echo "**** give setuid access to traceroute & tcptraceroute ****" && \
+  chmod a+s /usr/bin/traceroute && \
+  chmod a+s /usr/bin/tcptraceroute && \
+  echo "**** fix path to cropper.js ****" && \
+  sed -i 's#src="/cropper/#/src="cropper/#' /etc/smokeping/basepage.html && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/*
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 80
-VOLUME /config /data
+
+VOLUME /config

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/smokeping'
     PR_DOCKERHUB_IMAGE = 'lspipepr/smokeping'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.13'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/'
+    DIST_TAG = '3.17'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
     DIST_REPO_PACKAGES = 'smokeping'
     MULTIARCH='true'
     CI='true'

README.md

@@ -82,8 +82,8 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-      - </path/to/smokeping/config>:/config
-      - </path/to/smokeping/data>:/data
+      - /path/to/smokeping/config:/config
+      - /path/to/smokeping/data:/data
     ports:
       - 80:80
     restart: unless-stopped
@@ -98,8 +98,8 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -p 80:80 \
-  -v </path/to/smokeping/config>:/config \
-  -v </path/to/smokeping/data>:/data \
+  -v /path/to/smokeping/config:/config \
+  -v /path/to/smokeping/data:/data \
   --restart unless-stopped \
   lscr.io/linuxserver/smokeping:latest
 ```
@@ -226,6 +226,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.12.22:** - Rebase to Alpine 3.17, migrate to s6v3, switch to nginx and fcgiwrap.
 * **29.03.21:** - Dockerfile: Install curl before we call it
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **01.06.20:** - Rebasing to alpine 3.12.

jenkins-vars.yml

@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/smokeping'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/smokeping'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.13'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/'
+  - DIST_TAG = '3.17'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
   - DIST_REPO_PACKAGES = 'smokeping'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -17,8 +17,8 @@ available_architectures:
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/smokeping/config>", desc: "Configure the `Targets` file here" }
-  - { vol_path: "/data", vol_host_path: "</path/to/{{ project_name }}/data>", desc: "Storage location for db and application data (graphs etc)" }
+  - { vol_path: "/config", vol_host_path: "/path/to/smokeping/config", desc: "Configure the `Targets` file here" }
+  - { vol_path: "/data", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Storage location for db and application data (graphs etc)" }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "80", internal_port: "80", port_desc: "Allows HTTP access to the internal webserver." }
@@ -35,6 +35,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "12.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, switch to nginx and fcgiwrap." }
   - { date: "29.03.21:", desc: "Dockerfile: Install curl before we call it" }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }

root/defaults/httpd.conf

@@ -1,473 +0,0 @@
-#
-# This is the main Apache HTTP server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
-# In particular, see
-# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
-# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
-# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
-# will be interpreted as '/logs/access_log'.
-
-#
-# ServerTokens
-# This directive configures what you return as the Server HTTP response
-# Header. The default is 'Full' which sends information about the OS-Type
-# and compiled in modules.
-# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
-# where Full conveys the most information, and Prod the least.
-#
-ServerTokens Prod
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to specify a local disk on the
-# Mutex directive, if file-based mutexes are used.  If you wish to share the
-# same ServerRoot for multiple httpd daemons, you will need to change at
-# least PidFile.
-#
-ServerRoot /var/www
-
-#
-# Mutex: Allows you to set the mutex mechanism and mutex file directory
-# for individual mutexes, or change the global defaults
-#
-# Uncomment and change the directory if mutexes are file-based and the default
-# mutex file directory is not on a local disk or is not appropriate for some
-# other reason.
-#
-# Mutex default:/run/apache2
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule authn_file_module modules/mod_authn_file.so
-#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-#LoadModule authn_anon_module modules/mod_authn_anon.so
-#LoadModule authn_dbd_module modules/mod_authn_dbd.so
-#LoadModule authn_socache_module modules/mod_authn_socache.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_user_module modules/mod_authz_user.so
-#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-#LoadModule authz_owner_module modules/mod_authz_owner.so
-#LoadModule authz_dbd_module modules/mod_authz_dbd.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-#LoadModule auth_form_module modules/mod_auth_form.so
-#LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule allowmethods_module modules/mod_allowmethods.so
-#LoadModule file_cache_module modules/mod_file_cache.so
-#LoadModule cache_module modules/mod_cache.so
-#LoadModule cache_disk_module modules/mod_cache_disk.so
-#LoadModule cache_socache_module modules/mod_cache_socache.so
-#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
-#LoadModule socache_dbm_module modules/mod_socache_dbm.so
-#LoadModule socache_memcache_module modules/mod_socache_memcache.so
-#LoadModule watchdog_module modules/mod_watchdog.so
-#LoadModule macro_module modules/mod_macro.so
-#LoadModule dbd_module modules/mod_dbd.so
-#LoadModule dumpio_module modules/mod_dumpio.so
-#LoadModule echo_module modules/mod_echo.so
-#LoadModule buffer_module modules/mod_buffer.so
-#LoadModule data_module modules/mod_data.so
-#LoadModule ratelimit_module modules/mod_ratelimit.so
-LoadModule reqtimeout_module modules/mod_reqtimeout.so
-#LoadModule ext_filter_module modules/mod_ext_filter.so
-#LoadModule request_module modules/mod_request.so
-#LoadModule include_module modules/mod_include.so
-LoadModule filter_module modules/mod_filter.so
-#LoadModule reflector_module modules/mod_reflector.so
-#LoadModule substitute_module modules/mod_substitute.so
-#LoadModule sed_module modules/mod_sed.so
-#LoadModule charset_lite_module modules/mod_charset_lite.so
-#LoadModule deflate_module modules/mod_deflate.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule log_config_module modules/mod_log_config.so
-#LoadModule log_debug_module modules/mod_log_debug.so
-#LoadModule log_forensic_module modules/mod_log_forensic.so
-#LoadModule logio_module modules/mod_logio.so
-LoadModule env_module modules/mod_env.so
-#LoadModule mime_magic_module modules/mod_mime_magic.so
-#LoadModule expires_module modules/mod_expires.so
-LoadModule headers_module modules/mod_headers.so
-#LoadModule usertrack_module modules/mod_usertrack.so
-#LoadModule unique_id_module modules/mod_unique_id.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-#LoadModule remoteip_module modules/mod_remoteip.so
-#LoadModule session_module modules/mod_session.so
-#LoadModule session_cookie_module modules/mod_session_cookie.so
-#LoadModule session_dbd_module modules/mod_session_dbd.so
-#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
-#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
-#LoadModule dialup_module modules/mod_dialup.so
-#LoadModule mpm_event_module modules/mod_mpm_event.so
-LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
-#LoadModule mpm_worker_module modules/mod_mpm_worker.so
-LoadModule unixd_module modules/mod_unixd.so
-#LoadModule heartbeat_module modules/mod_heartbeat.so
-#LoadModule heartmonitor_module modules/mod_heartmonitor.so
-LoadModule status_module modules/mod_status.so
-LoadModule autoindex_module modules/mod_autoindex.so
-#LoadModule asis_module modules/mod_asis.so
-#LoadModule info_module modules/mod_info.so
-#LoadModule suexec_module modules/mod_suexec.so
-<IfModule !mpm_prefork_module>
-	LoadModule cgid_module modules/mod_cgid.so
-</IfModule>
-<IfModule mpm_prefork_module>
-	LoadModule cgi_module modules/mod_cgi.so
-</IfModule>
-#LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule dir_module modules/mod_dir.so
-#LoadModule actions_module modules/mod_actions.so
-#LoadModule speling_module modules/mod_speling.so
-#LoadModule userdir_module modules/mod_userdir.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule negotiation_module modules/mod_negotiation.so
-
-<IfModule unixd_module>
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User abc
-Group abc
-
-</IfModule>
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
-#
-ServerAdmin you@example.com
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (internal error documents, FTP directory
-# listings, mod_status and mod_info output etc., but not CGI generated
-# documents or custom error documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of:  On | Off | EMail
-#
-ServerSignature Off
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:80
-
-#
-# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other
-# <Directory> blocks below.
-#
-<Directory />
-    AllowOverride none
-    Require all denied
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/var/www/localhost/htdocs"
-<Directory "/var/www/localhost/htdocs">
-    #
-    # Possible values for the Options directive are "None", "All",
-    # or any combination of:
-    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-    #
-    # Note that "MultiViews" must be named *explicitly* --- "Options All"
-    # doesn't give it to you.
-    #
-    # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.4/mod/core.html#options
-    # for more information.
-    #
-    Options Indexes FollowSymLinks
-
-    #
-    # AllowOverride controls what directives may be placed in .htaccess files.
-    # It can be "All", "None", or any combination of the keywords:
-    #   AllowOverride FileInfo AuthConfig Limit
-    #
-    AllowOverride None
-
-    #
-    # Controls who can get stuff from this server.
-    #
-    Require all granted
-</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
-    DirectoryIndex index.html smokeping.cgi 
-</IfModule>
-
-# rewrite incoming root requeststo correct subpath
-RewriteEngine On
-RewriteRule ^/$ /smokeping/ [R]
-
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<Files ".ht*">
-    Require all denied
-</Files>
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog logs/error.log
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
-    #
-    # The following directives define some format nicknames for use with
-    # a CustomLog directive (see below).
-    #
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
-    <IfModule logio_module>
-      # You need to enable mod_logio.c to use %I and %O
-      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-    </IfModule>
-
-    #
-    # The location and format of the access logfile (Common Logfile Format).
-    # If you do not define any access logfiles within a <VirtualHost>
-    # container, they will be logged here.  Contrariwise, if you *do*
-    # define per-<VirtualHost> access logfiles, transactions will be
-    # logged therein and *not* in this file.
-    #
-    #CustomLog logs/access.log common
-
-    #
-    # If you prefer a logfile with access, agent, and referer information
-    # (Combined Logfile Format) you can use the following directive.
-    #
-    CustomLog logs/access.log combined
-</IfModule>
-
-<IfModule alias_module>
-    #
-    # Redirect: Allows you to tell clients about documents that used to
-    # exist in your server's namespace, but do not anymore. The client
-    # will make a new request for the document at its new location.
-    # Example:
-    # Redirect permanent /foo http://www.example.com/bar
-
-    #
-    # Alias: Maps web paths into filesystem paths and is used to
-    # access content that does not live under the DocumentRoot.
-    # Example:
-    # Alias /webpath /full/filesystem/path
-    #
-    # If you include a trailing / on /webpath then the server will
-    # require it to be present in the URL.  You will also likely
-    # need to provide a <Directory> section to allow access to
-    # the filesystem path.
-
-    #
-    # ScriptAlias: This controls which directories contain server scripts.
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the target directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the
-    # client.  The same rules about trailing "/" apply to ScriptAlias
-    # directives as to Alias.
-    #
-    ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
-
-</IfModule>
-
-<IfModule cgid_module>
-    #
-    # ScriptSock: On threaded servers, designate the path to the UNIX
-    # socket used to communicate with the CGI daemon of mod_cgid.
-    #
-    #Scriptsock cgisock
-</IfModule>
-
-#
-# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/var/www/localhost/cgi-bin">
-    AllowOverride None
-    Options None
-    Require all granted
-</Directory>
-
-<IfModule mime_module>
-    #
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
-    TypesConfig /etc/apache2/mime.types
-
-    #
-    # AddType allows you to add to or override the MIME configuration
-    # file specified in TypesConfig for specific file types.
-    #
-    #AddType application/x-gzip .tgz
-    #
-    # AddEncoding allows you to have certain browsers uncompress
-    # information on the fly. Note: Not all browsers support this.
-    #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
-    #
-    # If the AddEncoding directives above are commented-out, then you
-    # probably should define those extensions to indicate media types:
-    #
-    AddType application/x-compress .Z
-    AddType application/x-gzip .gz .tgz
-
-    #
-    # AddHandler allows you to map certain file extensions to "handlers":
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action directive (see below)
-    #
-    # To use CGI scripts outside of ScriptAliased directories:
-    # (You will also need to add "ExecCGI" to the "Options" directive.)
-    #
-    #AddHandler cgi-script .cgi
-
-    # For type maps (negotiated resources):
-    #AddHandler type-map var
-
-    #
-    # Filters allow you to process content before it is sent to the client.
-    #
-    # To parse .shtml files for server-side includes (SSI):
-    # (You will also need to add "Includes" to the "Options" directive.)
-    #
-    #AddType text/html .shtml
-    #AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-<IfModule mime_magic_module>
-    MIMEMagicFile /etc/apache2/magic
-</IfModule>
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# MaxRanges: Maximum number of Ranges in a request before
-# returning the entire resource, or one of the special
-# values 'default', 'none' or 'unlimited'.
-# Default setting is to accept 200 Ranges.
-#MaxRanges unlimited
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it,
-# memory-mapping or the sendfile syscall may be used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-# Defaults: EnableMMAP On, EnableSendfile Off
-#
-#EnableMMAP off
-#EnableSendfile on
-
-# Load config files from the config directory "/etc/apache2/conf.d".
-#
-IncludeOptional /config/site-confs/*.conf

root/defaults/nginx/site-confs/default.conf.sample

@@ -0,0 +1,49 @@
+## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-smokeping/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl http2 default_server;
+
+    server_name _;
+
+    location / {
+      return 301 http://$http_host/smokeping/smokeping.cgi;
+    }
+
+    location = /smokeping/smokeping.cgi {
+      fastcgi_intercept_errors on;
+      fastcgi_param	QUERY_STRING		$query_string;
+      fastcgi_param	REQUEST_METHOD		$request_method;
+      fastcgi_param	CONTENT_TYPE		$content_type;
+      fastcgi_param	CONTENT_LENGTH		$content_length;
+      fastcgi_param	REQUEST_URI		$request_uri;
+      fastcgi_param	DOCUMENT_URI		$document_uri;
+      fastcgi_param	DOCUMENT_ROOT		$document_root;
+      fastcgi_param	SERVER_PROTOCOL		$server_protocol;
+      fastcgi_param	GATEWAY_INTERFACE	CGI/1.1;
+      fastcgi_param	SERVER_SOFTWARE		nginx/$nginx_version;
+      fastcgi_param	REMOTE_ADDR		$remote_addr;
+      fastcgi_param	REMOTE_PORT		$remote_port;
+      fastcgi_param	SERVER_ADDR		$server_addr;
+      fastcgi_param	SERVER_PORT		$server_port;
+      fastcgi_param	SERVER_NAME		$server_name;
+      fastcgi_param	HTTPS			$https if_not_empty;
+      fastcgi_param SCRIPT_FILENAME /usr/share/webapps/smokeping/smokeping.cgi;
+
+      fastcgi_pass  unix:/run/fcgiwrap.sock;
+    }
+
+    location ^~ /smokeping/ {
+      root /usr/share/webapps;
+      index smokeping.cgi;
+      gzip off;
+    }
+
+    # deny access to .htaccess/.htpasswd files
+    location ~ /\.ht {
+        deny all;
+    }
+}

root/defaults/smokeping.conf

@@ -1,11 +0,0 @@
-LoadModule fcgid_module modules/mod_fcgid.so
-
-ScriptAlias /smokeping/smokeping.cgi /var/www/localhost/smokeping/smokeping.cgi
-Alias /smokeping /var/www/localhost/smokeping
-
-<Directory "/var/www/localhost/smokeping">
-    Options +ExecCGI
-    AddHandler fcgid-script .cgi
-    Options +FollowSymLinks
-    Require all granted
-</Directory>

root/etc/cont-init.d/30-config

@@ -1,48 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# create folders
-mkdir -p \
-	/config/site-confs \
-	/run/apache2 \
-	/var/cache/smokeping
-
-# copy config files
-
-PREV_DIR=$(pwd)
-
-	cd /defaults/smoke-conf || exit
-	shopt -s globstar nullglob
-	for i in *
- 	do
-	[[ ! -e "/config/${i}" ]] && cp -v "${i}" "/config/${i}"
-	done
-
-cd "${PREV_DIR}" || exit
-
-# make symlinks
-[[ ! -L /var/www/localhost/smokeping ]] && \
-	ln -sf /usr/share/webapps/smokeping /var/www/localhost/smokeping
-
-[[ ! -L /var/www/localhost/smokeping/cache ]] && \
-	ln -sf	/var/cache/smokeping /var/www/localhost/smokeping/cache
-
-[[ ! -e /config/site-confs/smokeping.conf ]] && \
-	cp /defaults/smokeping.conf /config/site-confs/smokeping.conf
-
-[[ ! -e /config/httpd.conf ]] && \
-	cp /defaults/httpd.conf /config/httpd.conf
-
-[[ ! -L /etc/apache2/httpd.conf ]] && \
-	ln -sf /config/httpd.conf /etc/apache2/httpd.conf
-
-[[ -e /config/ssmtp.conf ]] && \
-	cp /config/ssmtp.conf /etc/ssmtp/ssmtp.conf
-
-# permissions
-chown -R abc:abc \
-	/config \
-	/data \
-	/run/apache2 \
-	/usr/share/webapps/smokeping \
-	/var/cache/smokeping \
-	/var/www/localhost/smokeping

root/etc/s6-overlay/s6-rc.d/init-smokeping-config/run

@@ -0,0 +1,41 @@
+#!/usr/bin/with-contenv bash
+
+# create folders
+mkdir -p \
+    /data \
+    /var/cache/smokeping
+
+# copy config files
+
+PREV_DIR=$(pwd)
+
+cd /defaults/smoke-conf || exit
+shopt -s globstar nullglob
+for i in *
+do
+    [[ ! -e "/config/${i}" ]] && cp -v "${i}" "/config/${i}"
+done
+
+cd "${PREV_DIR}" || exit
+
+# make symlinks
+if [[ -e /config/ssmtp.conf ]]; then
+    cp /config/ssmtp.conf /etc/ssmtp/ssmtp.conf
+fi
+
+if [[ ! -L /usr/share/webapps/smokeping/cache ]]; then
+    ln -sf	/var/cache/smokeping /usr/share/webapps/smokeping/cache
+fi
+
+if [[ ! -f /usr/bin/tcpping ]]; then
+    install -m755 -D /defaults/tcpping /usr/bin/
+fi
+
+# permissions
+chmod 777 /var/cache/fontconfig/
+
+chown -R abc:abc \
+    /config \
+    /data \
+    /usr/share/webapps/smokeping \
+    /var/cache/smokeping

root/etc/s6-overlay/s6-rc.d/init-smokeping-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-smokeping-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-smokeping-config/run

root/etc/s6-overlay/s6-rc.d/svc-smokeping/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-setuidgid abc /usr/bin/smokeping --config="/etc/smokeping/config" --nodaemon

root/etc/s6-overlay/s6-rc.d/svc-smokeping/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-spawn-fcgi/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec 2>&1 \
+    /usr/bin/spawn-fcgi -n -s /run/fcgiwrap.sock -u abc -- /usr/bin/fcgiwrap

root/etc/s6-overlay/s6-rc.d/svc-spawn-fcgi/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/apache/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec /usr/sbin/apachectl -D FOREGROUND

root/etc/services.d/smokeping/run

@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec s6-setuidgid abc  /usr/bin/smokeping --config="/etc/smokeping/config" --nodaemon
-