Merge pull request #4077 from NginxProxyManager/develop

v2.12.1

Jenkinsfile

@@ -43,7 +43,7 @@ pipeline {
 					steps {
 						script {
 							// Defaults to the Branch name, which is applies to all branches AND pr's
-							buildxPushTags = "-t docker.io/nginxproxymanager/${IMAGE}-dev:${BRANCH_LOWER}"
+							buildxPushTags = "-t docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}"
 						}
 					}
 				}
@@ -203,13 +203,7 @@ pipeline {
 					}
 					steps {
 						script {
-							npmGithubPrComment("""Docker Image for build ${BUILD_NUMBER} is available on
+							npmGithubPrComment("Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`\n\n**Note:** ensure you backup your NPM instance before testing this PR image! Especially if this PR contains database changes.", true)
-[DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}-dev)
-as `nginxproxymanager/${IMAGE}-dev:${BRANCH_LOWER}`
-
-**Note:** ensure you backup your NPM instance before testing this image! Especially if there are database changes
-**Note:** this is a different docker image namespace than the official image
-""", true)
 						}
 					}
 				}

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/script.sh

@@ -1,54 +0,0 @@
-#!/command/with-contenv bash
-
-set -e # Exit immediately if a command exits with a non-zero status.
-
-function set_properties() {
-  sed -i "s,^$1=.*,$1=$2,g" "${3}"
-}
-
-echo "Deploy Crowdsec Openresty Bouncer.." 
-if [ -n "${CROWDSEC_OPENRESTY_BOUNCER}" ]; then
-   while IFS= read -r line
-   do 
-      if ! [[ "$line" != "^#" ]] || [[ "$line" != "^\n" ]]; then
-        name=$(echo "$line" | cut -d "=" -f1)
-        value=$(echo "$line" | cut -d "=" -f2)
-        if grep -q "${name}" /defaults/crowdsec/crowdsec-openresty-bouncer.conf ; then
-          set_properties "${name}" "${value}" "/defaults/crowdsec/crowdsec-openresty-bouncer.conf"
-        fi
-      fi
-   done <<< "${CROWDSEC_OPENRESTY_BOUNCER}"
-else
-	mkdir -p /data/crowdsec/templates
-	sed -i 's|/defaults/crowdsec|/data/crowdsec|' /etc/nginx/conf.d/crowdsec_openresty.conf
-
-	if [ -f /data/crowdsec/crowdsec-openresty-bouncer.conf ]; then
-		echo "Patch crowdsec-openresty-bouncer.conf .." 
-		sed "s/=.*//g" /data/crowdsec/crowdsec-openresty-bouncer.conf > /tmp/crowdsec.conf.raw
-		sed "s/=.*//g" /defaults/crowdsec/crowdsec-openresty-bouncer.conf > /tmp/crowdsec-openresty-bouncer.conf.raw
-		if grep -vf /tmp/crowdsec.conf.raw /tmp/crowdsec-openresty-bouncer.conf.raw ; then
-			grep -vf /tmp/crowdsec.conf.raw /tmp/crowdsec-openresty-bouncer.conf.raw > /tmp/config.newvals
-			cp /data/crowdsec/crowdsec-openresty-bouncer.conf /data/crowdsec/crowdsec-openresty-bouncer.conf.bak
-			grep -f /tmp/config.newvals /defaults/crowdsec/crowdsec-openresty-bouncer.conf >> /data/crowdsec/crowdsec-openresty-bouncer.conf
-		fi
-	else
-		echo "Deploy new crowdsec-openresty-bouncer.conf .." 
-		cp /defaults/crowdsec/crowdsec-openresty-bouncer.conf /data/crowdsec/crowdsec-openresty-bouncer.conf    
-	fi
-	#Make sure the config location is where we get the config from instead of /default/
-	sed -i 's|/defaults/crowdsec|/data/crowdsec|' /data/crowdsec/crowdsec-openresty-bouncer.conf
-fi
-
-
-#Make sure we only copy files that don't exist in /data/crowdsec.
-if [ -d "/data/crowdsec/templates" ]; then
-    echo "Deploy Crowdsec Templates .."
-    cd /defaults/crowdsec/templates/
-    for file in *.html
-    do
-        if [ ! -e "/data/crowdsec/templates/${file}" ]
-        then
-            cp -r "/defaults/crowdsec/templates/${file}" "/data/crowdsec/templates/"
-        fi
-    done
-fi

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/type

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

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/up

@@ -1,2 +0,0 @@
-# shellcheck shell=bash
-/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/script.sh

docs/src/setup/index.md

@@ -137,13 +137,5 @@ Email:    admin@example.com
 Password: changeme
 ```
 
-Immediately after logging in with this default user you will be asked to modify your details and change your password. You can change defaults with:
+Immediately after logging in with this default user you will be asked to modify your details and change your password.
-
-
-```
-    environment:
-      INITIAL_ADMIN_EMAIL: my@example.com
-      INITIAL_ADMIN_PASSWORD: mypassword1
-```
-
 

global/certbot-dns-plugins.json

@@ -7,7 +7,7 @@
 		"credentials": "dns_acmedns_api_url = http://acmedns-server/\ndns_acmedns_registration_file = /data/acme-registration.json",
 		"full_plugin_name": "dns-acmedns"
 	},
-	"active24":{
+    "active24":{
 		"name": "Active24",
 		"package_name": "certbot-dns-active24",
 		"version": "~=1.5.1",
@@ -424,13 +424,13 @@
 		"full_plugin_name": "dns-rfc2136"
 	},
 	"rockenstein": {
-		"name": "rockenstein AG",
+                "name": "rockenstein AG",
-		"package_name": "certbot-dns-rockenstein",
+                "package_name": "certbot-dns-rockenstein",
-		"version": "~=1.0.0",
+                "version": "~=1.0.0",
-		"dependencies": "",
+                "dependencies": "",
-		"credentials": "dns_rockenstein_token=<token>",
+                "credentials": "dns_rockenstein_token=<token>",
-		"full_plugin_name": "dns-rockenstein"
+                "full_plugin_name": "dns-rockenstein"
-	},
+        },
 	"route53": {
 		"name": "Route 53 (Amazon)",
 		"package_name": "certbot-dns-route53",