Compare commits

..

No commits in common. "65f53a45b681db3cbab7b5951f3a381ec6f430f9" and "de5ce3b797a2c703bab47bb5a328887ca9260644" have entirely different histories.

4 changed files with 13 additions and 11 deletions

View File

@ -9,7 +9,6 @@
<file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/manager-nginx.conf' mkdir='True' rm='True'/> <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/manager-nginx.conf' mkdir='True' rm='True'/>
<file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/handler-nginx.conf' mkdir='True' rm='True'/> <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/handler-nginx.conf' mkdir='True' rm='True'/>
<file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/portal-nginx.conf' mkdir='True' rm='True'/> <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/portal-nginx.conf' mkdir='True' rm='True'/>
<file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/nginx-lmlog.conf' mkdir='True' rm='True'/>
<file filelist='lemonldap-apache' name='/etc/lemonldap-ng/manager-apache2.X.conf' mkdir='True' rm='True'/> <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/manager-apache2.X.conf' mkdir='True' rm='True'/>
<file filelist='lemonldap-apache' name='/etc/lemonldap-ng/handler-apache2.X.conf' mkdir='True' rm='True'/> <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/handler-apache2.X.conf' mkdir='True' rm='True'/>

View File

@ -23,7 +23,8 @@ server {
} }
server { server {
listen 443 ssl; listen 443;
ssl on;
%if %%cert_type == "letsencrypt" %if %%cert_type == "letsencrypt"
ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem; ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem; ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@ -61,7 +62,7 @@ server {
deny all; deny all;
# Uncomment this if you use https only # Uncomment this if you use https only
add_header Strict-Transport-Security "max-age=15768000"; #add_header Strict-Transport-Security "max-age=15768000";
} }
} }

View File

@ -5,7 +5,8 @@ server {
} }
server { server {
listen 443 ssl; listen 443;
ssl on;
%if %%cert_type == "letsencrypt" %if %%cert_type == "letsencrypt"
ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem; ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem; ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@ -69,8 +70,8 @@ server {
# DEBIAN # DEBIAN
# If install was made with USEDEBIANLIBS (official releases), uncomment this # If install was made with USEDEBIANLIBS (official releases), uncomment this
location /javascript/ { #location /javascript/ {
alias /usr/share/javascript/; # alias /usr/share/javascript/;
} #}
} }

View File

@ -15,7 +15,8 @@ server {
} }
server { server {
listen 443 ssl; listen 443;
ssl on;
%if %%cert_type == "letsencrypt" %if %%cert_type == "letsencrypt"
ssl_certificate %%le_config_dir/live/%%authWebName/cert.pem; ssl_certificate %%le_config_dir/live/%%authWebName/cert.pem;
ssl_certificate_key %%le_config_dir/live/%%authWebName/privkey.pem; ssl_certificate_key %%le_config_dir/live/%%authWebName/privkey.pem;
@ -82,7 +83,7 @@ server {
# DEBIAN # DEBIAN
# If install was made with USEDEBIANLIBS (official releases), uncomment this # If install was made with USEDEBIANLIBS (official releases), uncomment this
location /javascript/ { #location /javascript/ {
alias /usr/share/javascript/; # alias /usr/share/javascript/;
} #}
} }