Commit a648380a authored by Xavier Guimard's avatar Xavier Guimard

Better manager install

parent 444275b1
......@@ -529,7 +529,7 @@ install_webserver_conf:
install_manager_site: install_conf_dir
# Manager install
@install -v -d $(RMANAGERSTATICDIR) $(RMANAGERPSGIDIR) \
@install -v -d $(RMANAGERDIR) $(RMANAGERSTATICDIR) $(RMANAGERPSGIDIR) \
$(RMANAGERTEMPLATESDIR)
@cp -pR $(SRCMANAGERDIR)/site/static/* $(RMANAGERSTATICDIR)
@for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
......
......@@ -30,7 +30,7 @@
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib).*"
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
Alias /psgi/ __MANAGERPSGIDIR__
Alias /psgi/ __MANAGERPSGIDIR__/
# 2) FastCGI engine
......@@ -69,6 +69,8 @@
</Location>
# Static files (javascripts, HTML forms,...)
Alias /static/ __MANAGERSTATICDIR__/
<Directory __MANAGERSTATICDIR__>
Require all granted
Options +FollowSymLinks
......
......@@ -30,7 +30,7 @@
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib).*"
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
Alias /psgi/ __MANAGERPSGIDIR__
Alias /psgi/ __MANAGERPSGIDIR__/
# 2) FastCGI engine
......@@ -76,6 +76,8 @@
</Location>
# Static files (javascripts, HTML forms,...)
Alias /static/ __MANAGERSTATICDIR__/
<Directory __MANAGERSTATICDIR__>
<IfVersion >= 2.3>
Require all granted
......
......@@ -30,7 +30,7 @@
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib).*"
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
Alias /psgi/ __MANAGERPSGIDIR__
Alias /psgi/ __MANAGERPSGIDIR__/
# 2) FastCGI engine
......@@ -70,6 +70,8 @@
</Location>
# Static files (javascripts, HTML forms,...)
Alias /static/ __MANAGERSTATICDIR__/
<Directory __MANAGERSTATICDIR__>
Order deny,allow
Allow from all
......
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