Moved Nginx Proxy Manager tools under the bin directory.

Author: jlesage

Dockerfile

@@ -147,7 +147,7 @@ RUN \
         openssl \
         apache2-utils \
         logrotate \
-        # For /opt/nginx-proxy-manager/handle-ipv6-setting
+        # For /opt/nginx-proxy-manager/bin/handle-ipv6-setting
         bash \
         # For openresty
         pcre \
@@ -204,7 +204,8 @@ RUN \
     cp -r /app/backend /opt/nginx-proxy-manager && \
     cp -r /app/frontend/dist /opt/nginx-proxy-manager/frontend && \
     cp -r /app/global /opt/nginx-proxy-manager && \
-    cp -r nginx-proxy-manager/docker/rootfs/bin/handle-ipv6-setting /opt/nginx-proxy-manager && \
+    mkdir /opt/nginx-proxy-manager/bin && \
+    cp -r nginx-proxy-manager/docker/rootfs/bin/handle-ipv6-setting /opt/nginx-proxy-manager/bin/ && \
     cp -r nginx-proxy-manager/docker/rootfs/etc/nginx /etc/ && \
     cp -r nginx-proxy-manager/docker/rootfs/var/www /var/ && \
     cp -r nginx-proxy-manager/docker/rootfs/etc/letsencrypt.ini /etc/ && \

README.md

@@ -306,7 +306,7 @@ For more details about port forwarding, see the following links:
 The password of a user can be reset to `changeme` with the following command:
 
 ```
-docker exec CONTAINER_NAME /opt/nginx-proxy-manager/reset-password.sh USER_EMAIL
+docker exec CONTAINER_NAME /opt/nginx-proxy-manager/bin/reset-password USER_EMAIL
 ```
 
 Where:

appdefs.xml

@@ -97,7 +97,7 @@ For more details about port forwarding, see the following links:
 The password of a user can be reset to `changeme` with the following command:
 
 ```
-docker exec CONTAINER_NAME /opt/nginx-proxy-manager/reset-password.sh USER_EMAIL
+docker exec CONTAINER_NAME /opt/nginx-proxy-manager/bin/reset-password USER_EMAIL
 ```
 
 Where:

rootfs/etc/cont-init.d/90-db-upgrade.sh

@@ -83,7 +83,7 @@ log "Dumping database..."
 
 # Convert the database.
 log "Converting database..."
-/opt/nginx-proxy-manager/mysql2sqlite /tmp/mysqldump.sql | sqlite3 /config/database.sqlite
+/opt/nginx-proxy-manager/bin/mysql2sqlite /tmp/mysqldump.sql | sqlite3 /config/database.sqlite
 
 # Update the database settings in configuration.
 if [ -f /config/production.json ]; then

rootfs/etc/cont-init.d/nginx-proxy-manager.sh

@@ -71,8 +71,8 @@ fi
 echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /config/nginx/resolvers.conf
 
 # Hnandle IPv6 settings.
-/opt/nginx-proxy-manager/handle-ipv6-setting /etc/nginx/conf.d
-/opt/nginx-proxy-manager/handle-ipv6-setting /config/nginx
+/opt/nginx-proxy-manager/bin/handle-ipv6-setting /etc/nginx/conf.d
+/opt/nginx-proxy-manager/bin/handle-ipv6-setting /config/nginx
 
 # Take ownership of the config directory content.
 find /config -mindepth 1 -exec chown $USER_ID:$GROUP_ID {} \;

rootfs/etc/services.d/cert_cleanup/run

@@ -23,6 +23,6 @@ log() {
 }
 
 log "starting..."
-s6-applyuidgid -u $USER_ID -g $GROUP_ID -G ${SUP_GROUP_IDS:-$GROUP_ID} /usr/local/bin/watch -i "$INTERVAL_IN_SECS" /opt/nginx-proxy-manager/lecleaner | log
+s6-applyuidgid -u $USER_ID -g $GROUP_ID -G ${SUP_GROUP_IDS:-$GROUP_ID} /usr/local/bin/watch -i "$INTERVAL_IN_SECS" /opt/nginx-proxy-manager/bin/lecleaner | log
 
 # vim:ft=sh:ts=4:sw=4:et:sts=4