Marius Burkard
2015-12-31 238326c6e7528571d0e8c68f310591206256ea77
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, December 31, 2015 02:54 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, December 31, 2015 02:54 -0500
commit238326c6e7528571d0e8c68f310591206256ea77
tree ce4e116d10b03685599b65531fe3139801376b07 tree | zip | gz
parent 982cb630fdad68eb6f6b90193fb0d92f0bfde787 view | diff
a639ee6c703cbaa9a89e195c343c473ee57294c6 view | diff
Merge branch 'master' into 'master'

maindomain of aps-instance changeable and ordered rewrite rules in apache-vhost-conf

1. maindomain in apsinstance:
Posibility to change main-domain of aps-instance over remote (in interface maind…omain is always the websites domain but over remote it's now possible to set an alias oder subdomain, that will be used in instance-settings. Important if e.g. wordpress-installation should run unter an aliasdomain instead of the websites domain)

2. append *-Rewrite-Rules to the end of rewrite-rules. With this it is possible to use
- sub.domain.tld
- *.domain.tld
together with different subdir-redirects (with the usage of redirect-type L for sub.domain.tld). Before this change it was never possible to get it always working, because it depended on the order in database if it worked or not.

See merge request !255
3 files modified
38 ■■■■ changed files
interface/lib/classes/aps_guicontroller.inc.php 20 ●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/aps.inc.php 11 ●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 7 ●●●● diff | view | raw | blame | history