remove SSL from nginx conf, restore nginx commands

notch8 · Aug 20, 2024 · abb380c · abb380c
1 parent 7c0dbdf
commit abb380c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/chart/princeton-manifold/templates/deployment-nginx.yaml b/chart/princeton-manifold/templates/deployment-nginx.yaml
@@ -29,6 +29,8 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: nginx
+          command:
+            - start-nginx
           ports:
             - containerPort: 80
           securityContext:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -94,6 +94,7 @@ services:
     ports:
      - "4000:80"
      - "4001:443"
+    command: ["start-nginx"]
     networks:
       - internal
 #volumes:

diff --git a/nginx/config/default.conf.template b/nginx/config/default.conf.template
@@ -12,20 +12,8 @@ upstream manifold_api {
 
 server {
   listen 80;
-  listen 443 ssl;
   root /opt/manifold/client/dist/build/client/build;
 
-  ssl_certificate           /etc/nginx/ssl/manifold.crt;
-  ssl_certificate_key       /etc/nginx/ssl/manifold.key;
-  ssl_session_timeout 1d;
-  ssl_session_cache shared:SSL:50m;
-  ssl_session_tickets off;
-
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256;
-  ssl_ecdh_curve secp384r1;
-  ssl_prefer_server_ciphers on;
-
   add_header Strict-Transport-Security "max-age=15768000; includeSubdomains; preload";
   add_header X-Frame-Options DENY;
   add_header X-Content-Type-Options nosniff;