Fix install path (closes: #595)
This commit is contained in:
parent
4964b5a5d5
commit
1efacd1d14
14
Makefile
14
Makefile
|
@ -50,14 +50,14 @@ DATADIR=$(LMPREFIX)/data
|
|||
# Document roots for Apache VirtualHosts
|
||||
DOCUMENTROOT=$(LMPREFIX)/htdocs
|
||||
PORTALDIR=$(DOCUMENTROOT)/portal
|
||||
PORTALSITEDIR=$(PORTALDIR)
|
||||
PORTALSTATICDIR=$(PORTALSITEDIR)/htdocs/static
|
||||
PORTALSITEDIR=$(PORTALDIR)/htdocs
|
||||
PORTALSTATICDIR=$(PORTALSITEDIR)/static
|
||||
PORTALRELATIVESTATICDIR=/static
|
||||
PORTALTEMPLATESDIR=$(PORTALSITEDIR)/templates
|
||||
PORTALTEMPLATESDIR=$(PORTALDIR)/templates
|
||||
|
||||
MANAGERDIR=$(DOCUMENTROOT)/manager
|
||||
MANAGERSITEDIR=$(MANAGERDIR)
|
||||
MANAGERSTATICDIR=$(MANAGERSITEDIR)/htdocs/static
|
||||
MANAGERSITEDIR=$(MANAGERDIR)/htdocs
|
||||
MANAGERSTATICDIR=$(MANAGERSITEDIR)/static
|
||||
MANAGERRELATIVESTATICDIR=/static
|
||||
MANAGERTEMPLATESDIR=$(MANAGERSITEDIR)/templates
|
||||
DOCDIR=$(DOCUMENTROOT)
|
||||
|
@ -626,7 +626,7 @@ install_manager_site: install_conf_dir
|
|||
# Manager install
|
||||
@install -v -d $(RMANAGERDIR) $(RMANAGERSTATICDIR) \
|
||||
$(RMANAGERTEMPLATESDIR)
|
||||
@cp -pR -f $(SRCMANAGERDIR)/site/htdocs/manager.* $(RMANAGERDIR)
|
||||
@cp -pR -f $(SRCMANAGERDIR)/site/htdocs/manager.* $(RMANAGERSITEDIR)
|
||||
@cp -pR $(SRCMANAGERDIR)/site/htdocs/static/* $(RMANAGERSTATICDIR)
|
||||
@for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
|
||||
./scripts/transform-templates \
|
||||
|
@ -652,7 +652,7 @@ install_portal_site: install_conf_dir
|
|||
@install -v -d $(RPORTALDIR) $(RPORTALSTATICDIR) \
|
||||
$(RPORTALTEMPLATESDIR) \
|
||||
$(RCRONDIR) $(RCONFDIR)
|
||||
@cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALDIR)
|
||||
@cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALSITEDIR)
|
||||
@cp -pR -f $(SRCPORTALDIR)/site/htdocs/static/* $(RPORTALSTATICDIR)
|
||||
cd $(SRCPORTALDIR)/site/templates; for f in `find * -type f -name '*.tpl'`; do \
|
||||
echo "$$f => $(RPORTALTEMPLATESDIR)/$$f"; \
|
||||
|
|
|
@ -46,12 +46,12 @@
|
|||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
#FastCgiServer __MANAGERSITEDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
||||
DocumentRoot __MANAGERDIR__
|
||||
DocumentRoot __MANAGERSITEDIR__
|
||||
|
||||
<Location />
|
||||
Require all granted
|
||||
|
|
|
@ -46,12 +46,12 @@
|
|||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
#FastCgiServer __MANAGERSITEDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
||||
DocumentRoot __MANAGERDIR__
|
||||
DocumentRoot __MANAGERSITEDIR__
|
||||
|
||||
<Location />
|
||||
<IfVersion >= 2.3>
|
||||
|
|
|
@ -46,12 +46,12 @@
|
|||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
#FastCgiServer __MANAGERSITEDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
||||
DocumentRoot __MANAGERDIR__
|
||||
DocumentRoot __MANAGERSITEDIR__
|
||||
|
||||
<Location />
|
||||
Order Deny,Allow
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
server {
|
||||
listen __PORT__;
|
||||
server_name manager.__DNSDOMAIN__;
|
||||
root __MANAGERDIR__;
|
||||
root __MANAGERSITEDIR__;
|
||||
|
||||
if ($uri !~ ^/(.*\.psgi|static|doc|fr-doc|lib|javascript|favicon)) {
|
||||
rewrite ^/(.*)$ /manager.psgi/$1 break;
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
ServerName auth.__DNSDOMAIN__
|
||||
|
||||
# DocumentRoot (FCGI scripts)
|
||||
DocumentRoot __PORTALDIR__
|
||||
<Directory __PORTALDIR__>
|
||||
DocumentRoot __PORTALSITEDIR__
|
||||
<Directory __PORTALSITEDIR__>
|
||||
Require all granted
|
||||
Options +ExecCGI +FollowSymLinks
|
||||
</Directory>
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
ServerName auth.__DNSDOMAIN__
|
||||
|
||||
# DocumentRoot (FCGI scripts)
|
||||
DocumentRoot __PORTALDIR__
|
||||
<Directory __PORTALDIR__>
|
||||
DocumentRoot __PORTALSITEDIR__
|
||||
<Directory __PORTALSITEDIR__>
|
||||
<IfVersion >= 2.3>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
ServerName auth.__DNSDOMAIN__
|
||||
|
||||
# DocumentRoot (FCGI scripts)
|
||||
DocumentRoot __PORTALDIR__
|
||||
<Directory __PORTALDIR__>
|
||||
DocumentRoot __PORTALSITEDIR__
|
||||
<Directory __PORTALSITEDIR__>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
Options +ExecCGI +FollowSymLinks
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
server {
|
||||
listen __PORT__;
|
||||
server_name auth.__DNSDOMAIN__;
|
||||
root __PORTALDIR__;
|
||||
root __PORTALSITEDIR__;
|
||||
|
||||
if ($uri !~ ^/((static|javascript|favicon).*|.*\.psgi)) {
|
||||
rewrite ^/(.*)$ /index.psgi/$1 break;
|
||||
|
|
Loading…
Reference in New Issue