diff --git a/salt/common/init.sls b/salt/common/init.sls index b7fbc2fb2..954c5c1ba 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -123,7 +123,6 @@ so-core: - /opt/so/tmp/nginx/:/run:rw - /etc/pki/masterssl.crt:/etc/pki/nginx/server.crt:ro - /etc/pki/masterssl.key:/etc/pki/nginx/server.key:ro - - cap_add: NET_BIND_SERVICE - port_bindings: - 80:80 diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master index 134d7a0c7..6b2b55871 100644 --- a/salt/common/nginx/nginx.conf.so-master +++ b/salt/common/nginx/nginx.conf.so-master @@ -74,7 +74,7 @@ http { index index.html; ssl_certificate "/etc/pki/nginx/server.crt"; - ssl_certificate_key "/etc/pki/nginx/private/server.key"; + ssl_certificate_key "/etc/pki/nginx/server.key"; ssl_session_cache shared:SSL:1m; ssl_session_timeout 10m; ssl_ciphers HIGH:!aNULL:!MD5;