added all the things

root/etc/cont-init.d/69-geoip2influx

@@ -0,0 +1,56 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -d /usr/lib/python3.8/site-packages/influxdb ]; then
+  echo '-------------------------------------------------------------'
+  echo '| Mod by Gilbn                                              |'
+  echo '| Running installation of required modules for Geoip2Influx |'
+  echo '-------------------------------------------------------------'
+  pip3 install --no-cache-dir -U \
+    geoip2==3.0.0 \
+    geohash2==1.1 \
+    influxdb==5.3.0 \
+    IPy==1.0
+fi
+
+if [ ! -d /config/geoip2db ]; then
+    echo '-------------------------------------'
+    echo '| Creating /config/geoip2db/ folder |'
+    echo '-------------------------------------'
+    mkdir  /config/geoip2db
+fi
+
+# Fetch latest or update existing
+if [[ ! -d geoip2influx/.git ]]; then
+  echo '---------------------------'
+  echo '| Installing Geoip2Influx |'
+  echo '---------------------------'
+  git clone --progress --verbose https://github.com/gilbN/geoip2influx.git
+  cp geoip2influx/geoip2influx.py /config/geoip2db/
+  chown -R abc:abc /config/geoip2db
+  chmod +x /config/geoip2db/geoip2influx.py
+  
+elif [[ -d geoip2influx/.git ]]; then
+  echo '-------------------------'
+  echo '| Updating Geoip2Influx |'
+  echo '-------------------------'
+  cd geoip2influx/
+  git pull
+  cp geoip2influx.py /config/geoip2db/
+  chown -R abc:abc /config/geoip2db
+  chmod +x /config/geoip2db/geoip2influx.py
+fi
+
+# Display variables for troubleshooting
+echo -e "Variables set:\\n\
+NGINX_LOG_PATH=${NGINX_LOG_PATH}\\n\
+INFLUX_HOST=${INFLUX_HOST}\\n\
+INFLUX_HOST_PORT=${INFLUX_HOST_PORT}\\n\
+INFLUX_DATABASE=${INFLUX_DATABASE}\\n\
+INFLUX_USER=${INFLUX_USER}\\n\
+INFLUX_PASS=${INFLUX_PASS}\\n\
+INFLUX_RETENTION=${INFLUX_RETENTION}\\n\
+INFLUX_SHARD=${INFLUX_SHARD}\\n\
+GEO_MEASUREMENT=${GEO_MEASUREMENT}\\n\
+LOG_MEASUREMENT=${LOG_MEASUREMENT}\\n\
+SEND_NGINX_LOGS=${SEND_NGINX_LOGS}\\n\
+GEOIP2INFLUX_LOG_LEVEL=${GEOIP2INFLUX_LOG_LEVEL}\\n"

root/etc/cont-init.d/98-vpn-config

@@ -1,27 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Determine if setup is needed
-if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \
-[ -f /usr/bin/apt ]; then
-  ## Ubuntu
-  apt-get update
-  apt-get install --no-install-recommends -y \
-    iptables \
-    openssh-client \
-    python3 \
-    python3-pip 
-  pip3 install sshuttle
-fi
-if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \
-[ -f /sbin/apk ]; then
-  # Alpine
-  apk add --no-cache \
-    iptables \
-    openssh \
-    py3-pip \
-    python3 
-  pip3 install sshuttle
-fi
-
-chown -R root:root /root
-chmod -R 600 /root/.ssh

root/etc/logrotate.d/geoip2influx

@@ -0,0 +1,14 @@
+/config/geoip2db/geoip2influx.log {
+ daily
+ rotate 7
+ size 25M
+ compress
+ delaycompress
+ nodateext
+ missingok
+ notifempty
+ postrotate
+    s6-svc -r /var/run/s6/services/geoip2influx
+ endscript
+ su abc abc
+}

root/etc/services.d/geoip2influx/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+  exec \
+        python3 /config/geoip2db/geoip2influx.py

root/etc/services.d/sshvpn/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16