conf.d templates

hydroshare · Mar 27, 2023 · cf968c1 · cf968c1
1 parent 6e0bbbd
commit cf968c1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/nginx/conf.d_templates/caddy.conf.conf b/nginx/conf.d_templates/caddy.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/caddy-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/caddy/caddy.crt;
+    ssl_certificate_key /etc/nginx/certs/caddy/caddy.key;
     include ssl/ssl-params.conf;
 
     location / {

diff --git a/nginx/conf.d_templates/es.conf.conf.conf b/nginx/conf.d_templates/es.conf.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/es-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/elasticsearch/elasticsearch.crt;
+    ssl_certificate_key /etc/nginx/certs/elasticsearch/elasticsearch.key;
     include ssl/ssl-params.conf;
 
 #    # Deny Nodes Shutdown API

diff --git a/nginx/conf.d_templates/kibana.conf.conf b/nginx/conf.d_templates/kibana.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/kibana-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/kibana/kibana.crt;
+    ssl_certificate_key /etc/nginx/certs/kibana/kibana.key;
     include ssl/ssl-params.conf;
 
     location / {

diff --git a/nginx/conf.d_templates/logstash.conf.conf b/nginx/conf.d_templates/logstash.conf.conf
@@ -7,8 +7,8 @@ server {
     server_name ${METRICS_HOSTNAME};
     access_log /var/log/nginx/logstash-public.log;
 
-    ssl_certificate /etc/nginx/certs/${METRICS_HOSTNAME}.crt;
-    ssl_certificate_key /etc/nginx/certs/${METRICS_HOSTNAME}.key;
+    ssl_certificate /etc/nginx/certs/logstash/logstash.crt;
+    ssl_certificate_key /etc/nginx/certs/logstash/logstash.key;
     include ssl/ssl-params.conf;
 
     location / {

diff --git a/self-cert/.dockerignore b/self-cert/.dockerignore
diff --git a/self-cert/Dockerfile b/self-cert/Dockerfile
diff --git a/tls/instances.yml b/tls/instances.yml
@@ -21,6 +21,22 @@ instances:
   - 127.0.0.1
   - ::1
 
+- name: logstash
+  dns:
+  - logstash
+  - localhost
+  ip:
+  - 127.0.0.1
+  - ::1
+
+- name: caddy
+  dns:
+  - caddy
+  - localhost
+  ip:
+  - 127.0.0.1
+  - ::1
+
 - name: fleet-server
   dns:
   - fleet-server