v1.1.3 (#77)

* updated maxmind db, 2022-07-29 (#73)
* changed goaccess processes to run in the background and added tini to the frontend so that it should run as one process

Author: xavier-hernandez

Dockerfile

@@ -44,4 +44,5 @@ COPY /resources/scripts/start.sh start.sh
 VOLUME ["/opt/log"]
 VOLUME ["/opt/custom"]
 EXPOSE 7880
-CMD ["bash", "/goan/start.sh"]
+#CMD ["bash", "/goan/start.sh"]
+ENTRYPOINT ["tini", "--", "/goan/start.sh"]

resources/scripts/logs/custom.sh

@@ -18,11 +18,20 @@ function custom_init(){
 
     if [[ -f ${goan_config} ]]; then
         echo -e "goaccess.conf file found"
+        if [[ "${DEBUG}" == "True" ]]; then
+            echo -e "\n**************BEGIN DEBUG***********************"
+            echo -e "${goan_config} file permissions"
+            stat -L -c "%a %G %U" ${goan_config}
+            echo -e "\n"
+            echo -e "${goan_config} content"
+            cat ${goan_config}
+            echo -e "**************END DEBUG***********************\n"
+        fi
         if [[ -r ${goan_config} ]]; then
             echo -e "goaccess.conf readable"
         else
             echo -e "goaccess.conf not readable"
-            exit
+            #exit
         fi
     else
         echo -e "goaccess.conf not found"
@@ -32,7 +41,7 @@ function custom_init(){
 
 function custom_instance(){
     echo -e "\nRUN CUSTOM GOACCESS"
-    tini -s -- /goaccess/goaccess --daemonize --no-global-config --config-file=${goan_config}
+    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
 }
 
 function custom(){

resources/scripts/logs/npm.sh

@@ -35,7 +35,7 @@ function npm_init(){
 
 function npm_instance(){
     echo -e "\nRUN NPM GOACCESS"
-    tini -s -- /goaccess/goaccess --daemonize --no-global-config --config-file=${goan_config}
+    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
 }
 
 function npm_goaccess_config(){

resources/scripts/logs/npm_redirection.sh

@@ -35,7 +35,7 @@ function npm_redirect_init(){
 
 function npm_redirect_instance(){
     echo -e "\nRUN NPM REDIRECT GOACCESS"
-    tini -s -- /goaccess/goaccess --daemonize --no-global-config --config-file=${goan_config}
+    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
 }
 
 function npm_redirect_goaccess_config(){

resources/scripts/logs/traefik.sh

@@ -35,7 +35,7 @@ function traefik_init(){
 
 function traefik_instance(){
     echo -e "\nRUN TRAEFIK GOACCESS"
-    tini -s -- /goaccess/goaccess --daemonize --no-global-config --config-file=${goan_config}
+    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
 }
 
 function traefik_goaccess_config(){

resources/scripts/start.sh

@@ -6,7 +6,7 @@ source $(dirname "$0")/logs/npm_redirection.sh
 source $(dirname "$0")/logs/traefik.sh
 source $(dirname "$0")/logs/custom.sh
 
-goan_version="GOAN v1.1.2"
+goan_version="GOAN v1.1.3"
 goan_log_path="/opt/log"
 
 echo -e "\n${goan_version}\n"
@@ -24,13 +24,13 @@ tini -s -- nginx
 
 # BEGIN PROXY LOGS
 if [[ -z "${LOG_TYPE}" || "${LOG_TYPE}" == "NPM" || "${LOG_TYPE}" == "NPM+R" ]]; then
-    echo -e "\n\nNPM INSTANCE SETTING UP..."
-    npm
-    
     if [[ "${LOG_TYPE}" == "NPM+R" ]]; then
         echo -e "\n\nNPM REDIRECT INSTANCE SETTING UP..."
         npm_redirect
     fi
+    
+    echo -e "\n\nNPM INSTANCE SETTING UP..."
+    npm
 elif [[ "${LOG_TYPE}" == "TRAEFIK" ]]; then
     traefik
 elif [[ "${LOG_TYPE}" == "CUSTOM" ]]; then
@@ -39,4 +39,4 @@ fi
 # END PROXY LOGS
 
 #Leave container running
-tail -f /dev/null
+wait -n