Added finish hook & sorting names

Added finish hook to container system, which executes before container shutdown, sorted hook names, updated run_hooks help

Author: SloCompTech

CONTRIBUTING.md

@@ -51,16 +51,17 @@ Sections:
         hook # Example hook configs
     module # Modules for openvpn
     hooks # Put your custom scripts in one of subfolders
+        auth # On authentication (needs to be enabled in config)
+        client-connect # Client connected
+        client-disconnect # Client disconnected
+        down # After interface is down
+        finish # Deinit container
         init # Init container
+        learn-address
         route-up # After routes are added
         route-pre-down # Before routes are removed
         up # After interface is up  
-        down # After interface is down
-        client-connect # Client connected
-        client-disconnect # Client disconnected
-        learn-address
         tls-verify # Check certificate
-        auth # On authentication (needs to be enabled in config)
     system.conf # System OpenVPN config file (do not edit, unless instructed)
     include-server.conf # File that includes all server configuration files (automatically generated)
     donotdelete # Leave this file alone, if deleted it triggers full setup

root/app/bin/run_hooks

@@ -10,10 +10,17 @@ function usage() {
     echo "Usage: run_hooks HOOK_NAME [ARGS]"
     echo ""
     echo "Hooks:"
-    echo "  up          saasas"
-    echo "  down-pre    asasss"
-    echo "  down-post   asasda"
-    echo "  auth        asdasd"
+    echo "  auth                On OpenVPN client authentication"
+    echo "  client-connect      On OpenVPN client connected"
+    echo "  client-disconnect   On OpenVPN client disconnected"
+    echo "  finish              On container shutdown"
+    echo "  init                On container power on"
+    echo "  learn-address       Client Address & Routes validation"
+    echo "  down                Before/After TUN interface closed"
+    echo "  route-up            After routes are added"
+    echo "  route-pre-down      Before routes are removed"
+    echo "  tls-verify          On OpenVPN client certificate verificaton"
+    echo "  up                  After TUN interface opened"
 }
 
 # Check if hook name is set

root/defaults/system.conf

@@ -20,6 +20,7 @@ script-security 2
 route-up "/app/bin/run_hooks route-up"
 route-pre-down "/app/bin/run_hooks route-pre-down"
 up "/app/bin/run_hooks up"
+down-pre
 down "/app/bin/run_hooks down"
 client-connect "/app/bin/run_hooks client-connect"
 client-disconnect "/app/bin/run_hooks client-disconnect"

root/etc/cont-finish.d/99-custom_finish

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+#
+#   Runs custom finish scripts in /config/hooks/finish
+#
+
+run_hooks finish
+
+exit $?

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

@@ -3,7 +3,7 @@
 # File which indicates that full init was already done before
 FLAG_FILE=/config/donotdelete
 
-HOOKS_DIR=(init route-up route-pre-down up down client-connect client-disconnect learn-address tls-verify auth)
+HOOKS_DIR=(auth client-connect client-disconnect finish down init learn-address route-pre-down route-up up tls-verify)
 OVPN_DIR=(ccd client server)
 
 FIRST_SETUP=0