Merge pull request 'update to cronicle-edge 1.6.3' (#6) from develop into main

Reviewed-on: #6

Dockerfile

@@ -23,7 +23,7 @@ ENV TZ=UTC
 ENV LOG_LEVEL=9
 
 #Get required packages
-RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm nano openssl
+RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm nano
 
 #Make folders
 RUN mkdir /config && \
@@ -57,6 +57,5 @@ RUN chmod +x /cronicle-prepare.sh && \
     chown -R ${PUID}:${PGID} /app /config
 
 EXPOSE 3012
-EXPOSE 3013
 
 ENTRYPOINT [ "/init" ]

README.md

@@ -92,35 +92,6 @@ services:
 
 This container automatically checks for scripts in `/config/init` and runs them at startup. This could be useful if you need to install additional applications into a worker container so it can execute jobs.
 
-## Reverse Proxying
-
-For a single manager behind a reverse proxy, you may need to specify a specific route for the web-socket connections.
-
-An example using nginx: 
-
-```  
-  location /socket.io/ {
-        client_max_body_size                    2048m;
-        proxy_read_timeout                      86400s;
-        proxy_send_timeout                      86400s;
-        proxy_set_header                        X-Forwarded-Host $host;
-        proxy_set_header                        X-Forwarded-Server $host;
-        proxy_set_header                        X-Real-IP $remote_addr;
-        proxy_set_header                        Host $host;
-        proxy_set_header                        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_http_version                      1.1;
-        proxy_redirect                          off;
-        proxy_set_header                        Upgrade $http_upgrade;
-        proxy_set_header                        Connection "upgrade"; 
-
-    proxy_pass          http://localhost:3012/socket.io/;
-  }
-  ```
-
-Source: https://github.com/jhuckaby/Cronicle/issues/535
-
-Load-balancing between multiple managers, as described [here](https://github.com/jhuckaby/Cronicle/blob/master/docs/Setup.md#load-balancers), has not been tested, and could behave strangely due to docker DNS.
-
 ## Ports
 
 |Port |Description|

root/cronicle-prepare.sh

@@ -28,11 +28,9 @@ fi
 
 if [ ! -d /config/cronicle ]
 then
-
     echo "Directory /config/cronicle not found. Creating."
 
     mkdir /config/cronicle
-
 fi
 
 #Detecting what mode Cronicle should be started in
@@ -50,27 +48,15 @@ then
         cp -r /app/cronicle/conf /config/cronicle/conf
         rm -rf /app/cronicle/conf
         ln -s /config/cronicle/conf /app/cronicle/conf
-
     else
 
         echo "Config dir already exists. Doesn't need creating."
         echo "Linking persistent config dir back into Cronicle."
-
         rm -rf /app/cronicle/conf
         ln -s /config/cronicle/conf /app/cronicle/conf
 
     fi
 
-    if [ ! -f /config/cronicle/conf/ssl.crt ] || [ ! -f /config/cronicle/conf/ssl.key ]
-    then
-
-        echo "One or both SSL components are missing. Generating."
-
-        rm -f /config/cronicle/conf/ssl.crt /config/cronicle/conf/ssl.key
-        openssl req -x509 -newkey rsa:4096 -keyout /config/cronicle/conf/ssl.key -out /config/cronicle/conf/ssl.crt -sha256 -days 3650 -nodes -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=CommonNameOrHostname"
-
-    fi
-    
     if [ ! -f /config/cronicle/data/.setup_done ]
     then
 
@@ -102,8 +88,6 @@ then
     then
 
         echo "No config found. Copy config.json from the manager server and place it in /config/cronicle/conf dir."
-        echo "Don't forget to also copy the SSL certs if you're using SSL."
-
         mkdir -p /config/cronicle/conf
         exit 0
 
@@ -130,12 +114,10 @@ then
     cp -r /app/cronicle/logs /config/cronicle/logs
     rm -rf /app/cronicle/logs
     ln -s /config/cronicle/logs /app/cronicle/logs
-
 else
 
     echo "Logs dir already exists. Doesn't need creating."
     echo "Linking persistent logs dir back into Cronicle."
-    
     rm -rf /app/cronicle/logs
     ln -s /config/cronicle/logs /app/cronicle/logs