diff --git a/api_auth_docker/Dockerfile b/api_auth_docker/Dockerfile index c1db73b..2060b1f 100644 --- a/api_auth_docker/Dockerfile +++ b/api_auth_docker/Dockerfile @@ -11,11 +11,8 @@ RUN apk add --update --no-cache \ COPY auth.sh /etc/nginx/conf.d COPY default-ssl.conf /etc/nginx/conf.d/default.conf COPY entrypoint.sh entrypoint.sh -COPY keys.properties /etc/nginx/conf.d -COPY api.properties /etc/nginx/conf.d COPY trace.sh /etc/nginx/conf.d COPY tests.sh /etc/nginx/conf.d -COPY ip-whitelist.conf /etc/nginx/conf.d RUN chmod +x /etc/nginx/conf.d/auth.sh entrypoint.sh diff --git a/api_auth_docker/default-ssl.conf b/api_auth_docker/default-ssl.conf index d5487d7..4427e24 100644 --- a/api_auth_docker/default-ssl.conf +++ b/api_auth_docker/default-ssl.conf @@ -2,7 +2,7 @@ server { listen 443 ssl; server_name localhost; - include /etc/nginx/conf.d/ip-whitelist.conf; + #include /etc/nginx/conf.d/ip-whitelist.conf; ssl_certificate /etc/ssl/certs/cert.pem; ssl_certificate_key /etc/ssl/private/key.pem; diff --git a/api_auth_docker/default.conf b/api_auth_docker/default.conf index e9d02c7..b3da9a1 100644 --- a/api_auth_docker/default.conf +++ b/api_auth_docker/default.conf @@ -2,7 +2,7 @@ server { listen 80; server_name localhost; - include /etc/nginx/conf.d/ip-whitelist.conf; + #include /etc/nginx/conf.d/ip-whitelist.conf; location / { auth_request /auth; diff --git a/api_auth_docker/ip-whitelist.conf b/api_auth_docker/ip-whitelist.conf deleted file mode 100644 index aa6e2c4..0000000 --- a/api_auth_docker/ip-whitelist.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Leave commented if you don't want to use IP whitelist - -#real_ip_header X-Forwarded-For; -#set_real_ip_from 0.0.0.0/0; - -# List of white listed IP addresses... -#allow 45.56.67.78; -#deny all; diff --git a/api_auth_docker/keys.properties b/api_auth_docker/keys.properties deleted file mode 100644 index 1a35c49..0000000 --- a/api_auth_docker/keys.properties +++ /dev/null @@ -1,7 +0,0 @@ -#kappiid="id";kapi_key="key";kapi_groups="group1,group2";leave the rest intact -kapi_id="001";kapi_key="2df1eeea370eacdc5cf7e96c2d82140d1568079a5d4d87006ec8718a98883b36";kapi_groups="watcher";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key} -kapi_id="002";kapi_key="50c5e483b80964595508f214229b014aa6c013594d57d38bcb841093a39f1d83";kapi_groups="watcher";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key} -kapi_id="003";kapi_key="b9b8d527a1a27af2ad1697db3521f883760c342fc386dbc42c4efbb1a4d5e0af";kapi_groups="watcher,spender";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key} -kapi_id="004";kapi_key="bb0458b705e774c0c9622efaccfe573aa30c82f62386d9435f04e9727cdc26fd";kapi_groups="watcher,spender";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key} -kapi_id="005";kapi_key="6c009201b123e8c24c6b74590de28c0c96f3287e88cac9460a2173a53d73fb87";kapi_groups="watcher,spender,admin";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key} -kapi_id="006";kapi_key="19e121b698014fac638f772c4ff5775a738856bf6cbdef0dc88971059c69da4b";kapi_groups="watcher,spender,admin";eval ugroups_${kapi_id}=${kapi_groups};eval ukey_${kapi_id}=${kapi_key}