Skip to content

Commit 74335d1

Browse files
aptalcaaptalca
committed
move auto generated confs into the container
1 parent 349b439 commit 74335d1

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

‎root/app/auto-proxy.sh‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ else
3030
for CONTAINER in $EXISTING_CONFS; do
3131
if ! grep -q "${CONTAINER}" <<< "${ENABLED_CONTAINERS}"; then
3232
echo "**** Removing conf for ${CONTAINER} ****"
33-
rm -rf "/auto-proxy/${CONTAINER}.conf" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
33+
rm -rf "/auto-proxy/${CONTAINER}.conf" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
3434
REMOVED_CONTAINERS="true"
3535
fi
3636
done
@@ -49,42 +49,42 @@ for CONTAINER in ${AUTO_GEN}; do
4949
done
5050
. /auto-proxy/${CONTAINER}.conf
5151
if [ -f "/config/nginx/proxy-confs/${CONTAINER}.subdomain.conf.sample" ]; then
52-
cp "/config/nginx/proxy-confs/${CONTAINER}.subdomain.conf.sample" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
52+
cp "/config/nginx/proxy-confs/${CONTAINER}.subdomain.conf.sample" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
5353
echo "**** Using preset proxy conf for ${CONTAINER} ****"
5454
if [ -n "${swag_auth_bypass}" ]; then
5555
echo "**** Swag auth bypass is auto managed via preset confs and cannot be overridden via env vars ****"
5656
fi
5757
if [ -n "${swag_port}" ]; then
58-
sed -i "s|set \$upstream_port .*|set \$upstream_port ${swag_port};|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
58+
sed -i "s|set \$upstream_port .*|set \$upstream_port ${swag_port};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
5959
echo "**** Overriding port for ${CONTAINER} ****"
6060
fi
6161
if [ -n "${swag_proto}" ]; then
62-
sed -i "s|set \$upstream_proto .*|set \$upstream_proto ${swag_proto};|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
62+
sed -i "s|set \$upstream_proto .*|set \$upstream_proto ${swag_proto};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
6363
echo "**** Overriding proto for ${CONTAINER} ****"
6464
fi
6565
if [ -n "${swag_url}" ]; then
66-
sed -i "s|server_name .*|server_name ${swag_url};|" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
66+
sed -i "s|server_name .*|server_name ${swag_url};|" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
6767
echo "**** Overriding url for ${CONTAINER} ****"
6868
fi
6969
if [ "${swag_auth}" == "authelia" ]; then
70-
sed -i "s|#include /config/nginx/authelia|include /config/nginx/authelia|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
70+
sed -i "s|#include /config/nginx/authelia|include /config/nginx/authelia|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
7171
echo "**** Enabling Authelia for ${CONTAINER} ****"
7272
elif [ "${swag_auth}" == "http" ]; then
73-
sed -i "s|#auth_basic|auth_basic|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
73+
sed -i "s|#auth_basic|auth_basic|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
7474
echo "**** Enabling basic http auth for ${CONTAINER} ****"
7575
elif [ "${swag_auth}" == "ldap" ]; then
76-
sed -i "s|#include /config/nginx/ldap.conf;|include /config/nginx/ldap.conf;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
77-
sed -i "s|#auth_request /auth;|auth_request /auth;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
78-
sed -i "s|#error_page 401 =200 /ldaplogin;|error_page 401 =200 /ldaplogin;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
76+
sed -i "s|#include /config/nginx/ldap.conf;|include /config/nginx/ldap.conf;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
77+
sed -i "s|#auth_request /auth;|auth_request /auth;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
78+
sed -i "s|#error_page 401 =200 /ldaplogin;|error_page 401 =200 /ldaplogin;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
7979
echo "**** Enabling basic http auth for ${CONTAINER} ****"
8080
fi
8181
else
8282
echo "**** No preset proxy conf found for ${CONTAINER}, generating from scratch ****"
83-
cp "/config/nginx/proxy-confs/_template.subdomain.conf.sample" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
83+
cp "/config/nginx/proxy-confs/_template.subdomain.conf.sample" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
8484
if [ -n "${swag_auth_bypass}" ]; then
85-
sed -i 's|^}$||' "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
85+
sed -i 's|^}$||' "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
8686
for location in $(echo ${swag_auth_bypass} | tr "," " "); do
87-
cat <<DUDE >> "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
87+
cat <<DUDE >> "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
8888
8989
location ~ ${location} {
9090
include /config/nginx/proxy.conf;
@@ -98,38 +98,38 @@ for CONTAINER in ${AUTO_GEN}; do
9898
9999
DUDE
100100
done
101-
echo "}" >> "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
101+
echo "}" >> "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
102102
fi
103-
sed -i "s|<container_name>|${CONTAINER}|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
103+
sed -i "s|<container_name>|${CONTAINER}|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
104104
if [ -z "${swag_port}" ]; then
105105
swag_port=$(docker inspect ${CONTAINER} | jq -r '.[0].NetworkSettings.Ports | keys[0]' | sed 's|/.*||')
106106
if [ "${swag_port}" == "null" ]; then
107107
echo "**** No exposed ports found for ${CONTAINER}. Setting reverse proxy port to 80. ****"
108108
swag_port="80"
109109
fi
110110
fi
111-
sed -i "s|set \$upstream_port .*|set \$upstream_port ${swag_port};|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
111+
sed -i "s|set \$upstream_port .*|set \$upstream_port ${swag_port};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
112112
echo "**** Setting port ${swag_port} for ${CONTAINER} ****"
113113
if [ -z "${swag_proto}" ]; then
114114
swag_proto="http"
115115
fi
116-
sed -i "s|set \$upstream_proto .*|set \$upstream_proto ${swag_proto};|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
116+
sed -i "s|set \$upstream_proto .*|set \$upstream_proto ${swag_proto};|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
117117
echo "**** Setting proto ${swag_proto} for ${CONTAINER} ****"
118118
if [ -z "${swag_url}" ]; then
119119
swag_url="${CONTAINER}.*"
120120
fi
121-
sed -i "s|server_name .*|server_name ${swag_url};|" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
121+
sed -i "s|server_name .*|server_name ${swag_url};|" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
122122
echo "**** Setting url ${swag_url} for ${CONTAINER} ****"
123123
if [ "${swag_auth}" == "authelia" ]; then
124-
sed -i "s|#include /config/nginx/authelia|include /config/nginx/authelia|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
124+
sed -i "s|#include /config/nginx/authelia|include /config/nginx/authelia|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
125125
echo "**** Enabling Authelia for ${CONTAINER} ****"
126126
elif [ "${swag_auth}" == "http" ]; then
127-
sed -i "s|#auth_basic|auth_basic|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
127+
sed -i "s|#auth_basic|auth_basic|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
128128
echo "**** Enabling basic http auth for ${CONTAINER} ****"
129129
elif [ "${swag_auth}" == "ldap" ]; then
130-
sed -i "s|#include /config/nginx/ldap.conf;|include /config/nginx/ldap.conf;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
131-
sed -i "s|#auth_request /auth;|auth_request /auth;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
132-
sed -i "s|#error_page 401 =200 /ldaplogin;|error_page 401 =200 /ldaplogin;|g" "/config/nginx/proxy-confs/auto-proxy-${CONTAINER}.subdomain.conf"
130+
sed -i "s|#include /config/nginx/ldap.conf;|include /config/nginx/ldap.conf;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
131+
sed -i "s|#auth_request /auth;|auth_request /auth;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
132+
sed -i "s|#error_page 401 =200 /ldaplogin;|error_page 401 =200 /ldaplogin;|g" "/etc/nginx/http.d/auto-proxy-${CONTAINER}.subdomain.conf"
133133
echo "**** Enabling basic http auth for ${CONTAINER} ****"
134134
fi
135135
fi

‎root/etc/cont-finish.d/98-auto-proxy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/with-contenv bash
22

33
sed -i '/\/app\/auto-proxy.sh/d' /config/crontabs/root
4-
rm -rf /config/nginx/proxy-confs/auto-proxy*.conf
4+
rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf

‎root/etc/cont-init.d/98-auto-proxy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ if [ ! -f /usr/local/bin/docker ]; then
55
exit 0
66
fi
77

8-
rm -rf /config/nginx/proxy-confs/auto-proxy*.conf
9-
cp /defaults/auto-proxy-readme /config/nginx/proxy-confs/auto-proxy-readme
8+
rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf
9+
sed -i 's|#include /etc/nginx/http.d|include /etc/nginx/http.d|' /config/nginx/nginx.conf
10+
cp /defaults/auto-proxy-readme /etc/nginx/http.d/auto-proxy-readme
1011
rm -rf /auto-proxy
1112
mkdir /auto-proxy
1213

0 commit comments

Comments
 (0)