Commit fe5c3dfb authored by Xavier Guimard's avatar Xavier Guimard

Fix many little things in manager conf

git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/branches/lemonldap-ng_version_1_9-bugfixes@5816 1dbb9719-a921-0410-b57f-c3a383c2c641
parent b9607c64
......@@ -402,6 +402,7 @@ reload_web_server:
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
/usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
elif [ -e e2e-tests/conf/nginx.pid ]; then \
echo "Reloading Nginx"; \
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
kill `cat e2e-tests/conf/llng-fastcgi.pid` || true; \
$(MAKE) plackup; \
......
......@@ -9,12 +9,6 @@
<VirtualHost __VHOSTLISTEN__>
ServerName manager.__DNSDOMAIN__
LogLevel notice
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log
#CustomLog ${APACHE_LOG_DIR}/lm.log combined
......@@ -46,6 +40,12 @@
<Directory __MANAGERPSGIDIR__>
SetHandler fcgid-script
Options +ExecCGI
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
</Directory>
# If you want to use mod_fastcgi, replace lines below by:
......@@ -85,7 +85,7 @@
# On-line documentation
Alias /doc/ __DEFDOCDIR__
Alias /lib/ __DEFDOCDIR__lib/
Alias /lib/ __DEFDOCDIR__pages/documentation/current/lib/
<Directory __DEFDOCDIR__>
Require all granted
ErrorDocument 404 /notfound.html
......
......@@ -9,12 +9,6 @@
<VirtualHost __VHOSTLISTEN__>
ServerName manager.__DNSDOMAIN__
LogLevel notice
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log
#CustomLog ${APACHE_LOG_DIR}/lm.log combined
......@@ -46,6 +40,12 @@
<Directory __MANAGERPSGIDIR__>
SetHandler fcgid-script
Options +ExecCGI
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
</Directory>
# If you want to use mod_fastcgi, replace lines below by:
......@@ -98,7 +98,7 @@
# On-line documentation
Alias /doc/ __DEFDOCDIR__
Alias /lib/ __DEFDOCDIR__lib/
Alias /lib/ __DEFDOCDIR__pages/documentation/current/lib/
<Directory __DEFDOCDIR__>
<IfVersion >= 2.3>
Require all granted
......
......@@ -9,12 +9,6 @@
<VirtualHost __VHOSTLISTEN__>
ServerName manager.__DNSDOMAIN__
LogLevel notice
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
#ErrorLog ${APACHE_LOG_DIR}/lm_err.log
#CustomLog ${APACHE_LOG_DIR}/lm.log combined
......@@ -46,6 +40,12 @@
<Directory __MANAGERPSGIDIR__>
SetHandler fcgid-script
Options +ExecCGI
<IfModule mod_headers.c>
header set Content-Security-Policy "default-src 'self';"
header set X-Content-Type-Options nosniff
header set X-Frame-Options DENY
header set X-XSS-Protection "1; mode=block"
</IfModule>
</Directory>
# If you want to use mod_fastcgi, replace lines below by:
......@@ -87,7 +87,7 @@
# On-line documentation
Alias /doc/ __DEFDOCDIR__
Alias /lib/ __DEFDOCDIR__lib/
Alias /lib/ __DEFDOCDIR__pages/documentation/current/lib/
<Directory __DEFDOCDIR__>
Order allow,deny
Allow from all
......
......@@ -14,32 +14,38 @@ server {
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.*\.psgi)(/.*)$;
fastcgi_param PATH_INFO $fastcgi_path_info;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header Content-Security-Policy "default-src 'self';";
add_header X-Frame-Options DENY;
# Uncomment this if you use https only
#add_header Strict-Transport-Security "15768000";
}
location / {
index manager.psgi;
try_files $uri $uri/ =404;
# Uncomment this if you use https only
#add_header Strict-Transport-Security "15768000";
}
# DEBIAN
# If install was made with USEDEBIANLIBS (official releases), uncomment this
#location /javascript/ {
# alias /usr/share/javascript/;
#}
location /doc/ {
alias __DEFDOCDIR__;
root __DEFDOCDIR__;
index index.html start.html;
}
location /lib/ {
alias __DEFDOCDIR__lib/;
root __DEFDOCDIR__pages/documentation/current/lib/;
}
location /fr-doc/ {
alias __FRDOCDIR__;
root __FRDOCDIR__;
index index.html start.html;
}
location /static/ {
root __MANAGERSTATICDIR__;
}
# DEBIAN
# If install was made with USEDEBIANLIBS (official releases), uncomment this
#location /javascript/ {
# alias /usr/share/javascript/;
#}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment