NGINX Port stuff

This commit is contained in:
Brett 2022-11-03 14:20:51 +01:00
parent d2cb903f87
commit 84f7e67f2d
3 changed files with 23 additions and 3 deletions

10
.env
View File

@ -7,6 +7,11 @@ DATAPUSHER_CONTAINER_NAME=datapusher
CKAN_CONTAINER_NAME=ckan CKAN_CONTAINER_NAME=ckan
WORKER_CONTAINER_NAME=ckan-worker WORKER_CONTAINER_NAME=ckan-worker
# Host Ports
CKAN_PORT_HOST=5000
NGINX_PORT_HOST=81
NGINX_SSLPORT_HOST=8443
# CKAN databases # CKAN databases
POSTGRES_USER=ckan POSTGRES_USER=ckan
POSTGRES_PASSWORD=ckan POSTGRES_PASSWORD=ckan
@ -27,6 +32,7 @@ CKAN_VERSION=2.9.5
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://ckan:5000 CKAN_SITE_URL=http://ckan:5000
CKAN_PORT=5000 CKAN_PORT=5000
CKAN_PORT_HOST=5000
CKAN_SYSADMIN_NAME=ckan_admin CKAN_SYSADMIN_NAME=ckan_admin
CKAN_SYSADMIN_PASSWORD=test1234 CKAN_SYSADMIN_PASSWORD=test1234
CKAN_SYSADMIN_EMAIL=your_email@example.com CKAN_SYSADMIN_EMAIL=your_email@example.com
@ -55,6 +61,10 @@ CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
DATAPUSHER_REWRITE_RESOURCES=True DATAPUSHER_REWRITE_RESOURCES=True
DATAPUSHER_REWRITE_URL=http://ckan:5000 DATAPUSHER_REWRITE_URL=http://ckan:5000
# NGINX
NGINX_PORT=80
NGINX_SSLPORT=443
# Extensions # Extensions
CKAN__PLUGINS="envvars image_view text_view recline_view datastore datapusher" CKAN__PLUGINS="envvars image_view text_view recline_view datastore datapusher"
CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__TYPE=redis

View File

@ -7,6 +7,11 @@ DATAPUSHER_CONTAINER_NAME=datapusher
CKAN_CONTAINER_NAME=ckan CKAN_CONTAINER_NAME=ckan
WORKER_CONTAINER_NAME=ckan-worker WORKER_CONTAINER_NAME=ckan-worker
# Host Ports
CKAN_PORT_HOST=5000
NGINX_PORT_HOST=81
NGINX_SSLPORT_HOST=8443
# CKAN databases # CKAN databases
POSTGRES_USER=ckan POSTGRES_USER=ckan
POSTGRES_PASSWORD=ckan POSTGRES_PASSWORD=ckan
@ -27,6 +32,7 @@ CKAN_VERSION=2.9.5
CKAN_SITE_ID=default CKAN_SITE_ID=default
CKAN_SITE_URL=http://ckan:5000 CKAN_SITE_URL=http://ckan:5000
CKAN_PORT=5000 CKAN_PORT=5000
CKAN_PORT_HOST=5000
CKAN_SYSADMIN_NAME=ckan_admin CKAN_SYSADMIN_NAME=ckan_admin
CKAN_SYSADMIN_PASSWORD=test1234 CKAN_SYSADMIN_PASSWORD=test1234
CKAN_SYSADMIN_EMAIL=your_email@example.com CKAN_SYSADMIN_EMAIL=your_email@example.com
@ -55,6 +61,10 @@ CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
DATAPUSHER_REWRITE_RESOURCES=True DATAPUSHER_REWRITE_RESOURCES=True
DATAPUSHER_REWRITE_URL=http://ckan:5000 DATAPUSHER_REWRITE_URL=http://ckan:5000
# NGINX
NGINX_PORT=80
NGINX_SSLPORT=443
# Extensions # Extensions
CKAN__PLUGINS="envvars image_view text_view recline_view datastore datapusher" CKAN__PLUGINS="envvars image_view text_view recline_view datastore datapusher"
CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__TYPE=redis

View File

@ -18,8 +18,8 @@ services:
ckan: ckan:
condition: service_healthy condition: service_healthy
ports: ports:
- "0.0.0.0:80:80" - "0.0.0.0:${NGINX_PORT_HOST}:${NGINX_PORT}"
- "0.0.0.0:443:443" - "0.0.0.0:${NGINX_SSLPORT_HOST}:${NGINX_SSLPORT}"
ckan: ckan:
container_name: ${CKAN_CONTAINER_NAME} container_name: ${CKAN_CONTAINER_NAME}
@ -38,7 +38,7 @@ services:
redis: redis:
condition: service_healthy condition: service_healthy
ports: ports:
- "0.0.0.0:${CKAN_PORT}:5000" - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}"
volumes: volumes:
- ckan_config:/etc/ckan - ckan_config:/etc/ckan