From 658ec5f9cc7bb933566b043fd9b15bae0738c875 Mon Sep 17 00:00:00 2001 From: harshit Date: Thu, 17 Nov 2022 15:23:52 +0530 Subject: [PATCH 1/3] dd auth to apache --- 4.0/Dockerfile | 3 +++ 4.0/conf.d/apache.conf | 9 ++++++--- 4.0/contrib/docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/4.0/Dockerfile b/4.0/Dockerfile index b6b5088d..b1f49e4f 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -126,6 +126,8 @@ FROM scratch COPY --from=build / / +COPY ./.httpasswd /etc/apache2/.httpasswd + # Please override this ENV NOMINATIM_PASSWORD qaIACxO6wMR3 # how many threads should be use for importing @@ -137,6 +139,7 @@ WORKDIR /app EXPOSE 5432 EXPOSE 8080 +EXPOSE 9082 COPY conf.d/env $PROJECT_DIR/.env diff --git a/4.0/conf.d/apache.conf b/4.0/conf.d/apache.conf index 922fc296..9728004c 100644 --- a/4.0/conf.d/apache.conf +++ b/4.0/conf.d/apache.conf @@ -1,5 +1,5 @@ -Listen 8080 - +Listen 9082 + DocumentRoot /nominatim/website CustomLog "|$/usr/bin/rotatelogs -n 7 /var/log/apache2/access.log 86400" combined ErrorLog "|$/usr/bin/rotatelogs -n 7 /var/log/apache2/error.log 86400" @@ -7,7 +7,10 @@ Listen 8080 Options FollowSymLinks MultiViews DirectoryIndex search.php - Require all granted + AuthType Basic + AuthName "Restricted Content" + AuthUserFile /etc/apache2/.httpasswd + Require valid-user AddType text/html .php diff --git a/4.0/contrib/docker-compose.yml b/4.0/contrib/docker-compose.yml index d7ba5f58..15367fc7 100644 --- a/4.0/contrib/docker-compose.yml +++ b/4.0/contrib/docker-compose.yml @@ -6,7 +6,7 @@ services: image: mediagis/nominatim:4.0 restart: always ports: - - "8080:8080" + - "8080:9082" environment: # see https://github.com/mediagis/nominatim-docker/tree/master/4.0#configuration for more options PBF_URL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf From ccf8021e7a44d75051b4f8d568dd6a40579b07b9 Mon Sep 17 00:00:00 2001 From: harshit Date: Thu, 17 Nov 2022 15:26:33 +0530 Subject: [PATCH 2/3] Add password file --- 4.0/.httpasswd | 1 + 1 file changed, 1 insertion(+) create mode 100644 4.0/.httpasswd diff --git a/4.0/.httpasswd b/4.0/.httpasswd new file mode 100644 index 00000000..ffe3e82c --- /dev/null +++ b/4.0/.httpasswd @@ -0,0 +1 @@ +test:$apr1$2mlvEUbA$7Ku8DGVwC5lqBAbJaqV0S/ From 548fd1314a515d3e58f195844f2a6dfe50fe0041 Mon Sep 17 00:00:00 2001 From: Rahul Uprety Date: Thu, 1 Dec 2022 16:54:17 +0530 Subject: [PATCH 3/3] removed port changes --- 4.0/Dockerfile | 1 - 4.0/conf.d/apache.conf | 4 ++-- 4.0/contrib/docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/4.0/Dockerfile b/4.0/Dockerfile index b1f49e4f..0e4d9633 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -139,7 +139,6 @@ WORKDIR /app EXPOSE 5432 EXPOSE 8080 -EXPOSE 9082 COPY conf.d/env $PROJECT_DIR/.env diff --git a/4.0/conf.d/apache.conf b/4.0/conf.d/apache.conf index 9728004c..20af378f 100644 --- a/4.0/conf.d/apache.conf +++ b/4.0/conf.d/apache.conf @@ -1,5 +1,5 @@ -Listen 9082 - +Listen 8080 + DocumentRoot /nominatim/website CustomLog "|$/usr/bin/rotatelogs -n 7 /var/log/apache2/access.log 86400" combined ErrorLog "|$/usr/bin/rotatelogs -n 7 /var/log/apache2/error.log 86400" diff --git a/4.0/contrib/docker-compose.yml b/4.0/contrib/docker-compose.yml index 15367fc7..d7ba5f58 100644 --- a/4.0/contrib/docker-compose.yml +++ b/4.0/contrib/docker-compose.yml @@ -6,7 +6,7 @@ services: image: mediagis/nominatim:4.0 restart: always ports: - - "8080:9082" + - "8080:8080" environment: # see https://github.com/mediagis/nominatim-docker/tree/master/4.0#configuration for more options PBF_URL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf