Skip to content

Commit f98b1c3

Browse files
committed
Changed default certs (fixes issues with certain browsers).
1 parent de37eca commit f98b1c3

File tree

6 files changed

+107
-19
lines changed

6 files changed

+107
-19
lines changed

config/jupyterhub_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ def per_user_limit(role):
301301

302302
# TLS config
303303
c.JupyterHub.port = jupyter_hub_ssl_port
304-
c.JupyterHub.ssl_key = os.environ.get("SSL_KEY", "/srv/jupyterhub/root-ca.key")
305-
c.JupyterHub.ssl_cert = os.environ.get("SSL_CERT", "/srv/jupyterhub/root-ca.pem")
304+
c.JupyterHub.ssl_key = os.environ.get("SSL_KEY", "/srv/jupyterhub/security/nifi.key")
305+
c.JupyterHub.ssl_cert = os.environ.get("SSL_CERT", "/srv/jupyterhub/security/nifi.pem")
306306

307307
# Persist hub data on volume mounted inside container
308308
data_dir = os.environ.get("DATA_VOLUME_CONTAINER", "")

docker/docker-compose-dev.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ services:
1313
- JUPYTERHUB_INTERNAL_PROXY_API_PORT=${JUPYTERHUB_INTERNAL_PROXY_API_PORT:-8887}
1414
- JUPYTERHUB_SSL_PORT=${JUPYTERHUB_SSL_PORT:-443}
1515
env_file:
16-
- ${DEPLOYMENT_ENV_FILE_PATH_GENERAL:-../env/general.env}
17-
- ${JUPYTERHUB_ENV_FILE_PATH_CONFIG:-../env/jupyter.env}
18-
user: "root"
16+
- ../env/general.env
17+
- ../env/jupyter.env
1918
volumes:
2019
- jupyter-hub-shared-scratch:/home/jovyan/scratch
2120
- jupyter-hub-vol:/srv/jupyterhub
2221
# Security configs
23-
- ./${DEFAULT_SECURITY_DIR:-../security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
24-
- ./${DEFAULT_SECURITY_DIR:-../security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
22+
- ./${DEFAULT_SECURITY_DIR:-../security/}:/srv/jupyterhub/security:ro
2523
- ../config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
2624
# User list and jupyter config
2725
- ../config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro
@@ -40,24 +38,15 @@ services:
4038
- "${JUPYTERHUB_INTERNAL_PORT:-8888}:${JUPYTERHUB_SSL_PORT:-443}"
4139
networks:
4240
- cognet
43-
extra_hosts:
44-
- ${ELASTICSEARCH_1_HOST_NAME:-test-1:0.0.0.0}
45-
- ${ELASTICSEARCH_2_HOST_NAME:-test-2:0.0.0.0}
46-
- ${ELASTICSEARCH_3_HOST_NAME:-test-3:0.0.0.0}
47-
- ${KIBANA_HOST_NAME:-test-4:0.0.0.0}
48-
- ${NIFI_HOST_NAME:-test-5:0.0.0.0}
4941

5042
volumes:
5143
jupyter-hub-vol:
5244
driver: local
5345
jupyter-hub-shared-scratch:
5446
driver: local
5547

56-
#---------------------------------------------------------------------------#
57-
# Docker networks. #
58-
#---------------------------------------------------------------------------#
5948
networks:
6049
cognet:
6150
name: cogstack-net
62-
external: true
51+
6352

env/jupyter.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ DOCKER_NOTEBOOK_IDLE_TIMEOUT=7200
3232
DATA_VOLUME_CONTAINER=""
3333

3434
# These don't really need to be changed.
35-
SSL_KEY="/srv/jupyterhub/root-ca.key"
36-
SSL_CERT="/srv/jupyterhub/root-ca.pem"
35+
SSL_KEY="/srv/jupyterhub/security/nifi.key"
36+
SSL_CERT="/srv/jupyterhub/security/nifi.pem"
3737

3838
DOCKER_NETWORK_NAME="cogstack-net"
3939

scripts/update_env_cert_from_nifi_repo.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ elif [[ -d scripts || -f Makefile || -f README.* || -d src || -d app ]]; then
1313
fi
1414

1515
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/deploy/general.env > ${OUTPUT_DIR_PATH_PREFIX}env/general.env
16+
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/certificates/nifi/nifi.key > ${OUTPUT_DIR_PATH_PREFIX}security/nifi.key
17+
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/certificates/nifi/nifi.pem > ${OUTPUT_DIR_PATH_PREFIX}security/nifi.pem
1618
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/certificates/root/root-ca.key > ${OUTPUT_DIR_PATH_PREFIX}security/root-ca.key
1719
curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/certificates/root/root-ca.pem > ${OUTPUT_DIR_PATH_PREFIX}security/root-ca.pem

security/nifi.key

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
-----BEGIN PRIVATE KEY-----
2+
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
51+
cBzkM2wmX4CT709DvH5BivqKANtQ
52+
-----END PRIVATE KEY-----

security/nifi.pem

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIH5TCCBc2gAwIBAgIUL8Q8IkSbyOkamFbESVZaIDKbbWowDQYJKoZIhvcNAQEL
3+
BQAwZDELMAkGA1UEBhMCVUsxDzANBgNVBAgMBkxvbmRvbjELMAkGA1UEBwwCVUsx
4+
ETAPBgNVBAoMCGNvZ3N0YWNrMREwDwYDVQQLDAhjb2dzdGFjazERMA8GA1UEAwwI
5+
Y29nc3RhY2swHhcNMjUwOTIzMTU1MDQwWhcNMjkwOTIyMTU1MDQwWjBkMQswCQYD
6+
VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQswCQYDVQQHDAJVSzERMA8GA1UECgwI
7+
Y29nc3RhY2sxETAPBgNVBAsMCGNvZ3N0YWNrMREwDwYDVQQDDAhjb2dzdGFjazCC
8+
AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALXZAn6GOCQwThaaMpUUVO1k
9+
w/G6W2JbHoDD9BlsjVLGaLJZ2q0V+1HSHgEV6RmjtqF05ABcd0u0eE/KEna2OSuF
10+
GYI8gHAU0tBm0ic/GOku5NVB7dR8vKZK6WtRhFDfFwg+6zAm4XpuaEkWfjexa/sN
11+
IhvAOUYMPwRY/nvyoUCSd873/KSHFhoAKO8YYeVEsvFgOqcLg8fvFDTv1ijjw1XP
12+
dfHwBWCS2etJMKtpnED4lcsDTfj7QfCxIl1fCcludZ0ZvpEgoEKfu35yps4l3kUM
13+
syHT04ELET8Cdgb3VsJPsOtgwgBQ5ZWjVRsoeqVQHZYada+yEU1xwng4BfbowdDW
14+
5969tiYv3NPwvNCOfaLlYO8J45PWcTD0CQRw4azapvFVKGEPOe5MlHsFjH/s1QT2
15+
uhCntXvX/hRSG32kN813VDIWlH/iOe1znxDUm1iDMepJ1c6Y05tkX2As13UYrHBD
16+
VnfKigxj4XXWaVS26ZRuvW+m7hEs6OtOIpXMGFoCeWXULS7WoxJ3LC9/sYrw/1Gs
17+
GkkIzIMU/1GTYtxxfhcO4UOFo//z1IVR+sZqwouxaJGyZoei806NCMABZ0KDaYDv
18+
91pfyGJkfCoH2UQGJSeL7uF8JSmal4sWSZd3CQdMu81eVa29mhyJfQxotezjupHE
19+
iz3haXGk4CpAczNJbKgLAgMBAAGjggKNMIICiTAMBgNVHRMBAf8EAjAAMA4GA1Ud
20+
DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwggIIBgNV
21+
HREEggH/MIIB+4IEbmlmaYISbmlmaS1yZWdpc3RyeS1mbG93gg1uaWZpLXJlZ2lz
22+
dHJ5ggpuaWZpLW5naW54gg9lbGFzdGljc2VhcmNoLTGCD2VsYXN0aWNzZWFyY2gt
23+
MoIPZWxhc3RpY3NlYXJjaC0zggtvY3Itc2VydmljZYIVb2NyLXNlcnZpY2UtdGV4
24+
dC1vbmx5ghRtZWRjYXQtdHJhaW5lci1uZ2lueIIRbWVkY2F0LXRyYWluZXItdWmC
25+
HW5scC1tZWRjYXQtc2VydmljZS1wcm9kdWN0aW9ugiJubHAtbWVkY2F0LXNlcnZp
26+
Y2UtcHJvZHVjdGlvbi1kZWlkgg9jb2dzdGFjay1raWJhbmGCD2NvZ3N0YWNrLWNv
27+
aG9ydIIYY29nc3RhY2stZWxhc3RpY3NlYXJjaC0xghhjb2dzdGFjay1lbGFzdGlj
28+
c2VhcmNoLTKCGGNvZ3N0YWNrLWVsYXN0aWNzZWFyY2gtM4INY29nc3RhY2stbmlm
29+
aYITY29nc3RhY2stbmlmaS1uZ2lueIIbY29nc3RhY2stbmlmaS1yZWdpc3RyeS1m
30+
bG93ghVjb2dzdGFjay1hdXRoLXNlcnZpY2WCCGNvZ3N0YWNrggoqLmNvZ3N0YWNr
31+
gglsb2NhbGhvc3SHBH8AAAGBEmFkbWluQGNvZ3N0YWNrLm5ldDAdBgNVHQ4EFgQU
32+
w4s/eH4/MgL0QFbHYVYa31bkPR0wHwYDVR0jBBgwFoAUE0cnEJt3wEkLed508BIF
33+
InehbX4wDQYJKoZIhvcNAQELBQADggIBACP0hymKsuSiIKXWPacMhehc+Pr2nUes
34+
ilzayYf7w2BW4j9NwUmrJxjh8XgkUvFzwi+oQPo7SVGcaPsVfMa1hdKn9+XP0mH5
35+
y5to1+u2p2dTYEViozHJXpDF+HG9AhX8/4vIWl66bofSQWWDgMGfd8gSmdZNbHOw
36+
hIY1LcpNd2XqG2JmF1osZi8hnndhApFk53QCwsL3kSccD/vjDwfRsLs2KNk42k3P
37+
gZIy/e5VZd6UBENJUVOxwAQ/Jp8luxKJV3Q0zy7UbREcdC7w7/lzeQONpgsRhWMb
38+
JjQIBSLkYtQ210RZDJwm79BgwPzHrsFgcB20QwG0LUNYnGdAEZnaqL6SqBPC5/Zn
39+
uisNAQWffyhOjxdkh1M5SlbEZXPpkcelxVBxytKr4DHp8knf9OQ0bPMFkGIcSvmK
40+
dGdoNtC5ULMWekrcbHYGNwOOiL/h1z7Baj2PboldWuWHa8IIOY56xOrqZs003HvS
41+
zp5t38OD8UHb+xRhBZ+otS/Q0NWv0UK+ih/KHn0BBMc0lSW019H3RtWTMqsPKJQa
42+
SkYVkC3hqdlYZEypbR+wnkHkwfFHKbgs5abMZ4RL0A8IE8AbkVV7Kklm/pmgEie6
43+
nVwoaKv3sS9LY7Y1IqgK0+lK+Qck/8wDAdbHAsNhf9vLlq67jWf7UySwa5E+abnO
44+
wstUgZZ/eHZd
45+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)