|
|
@ -56,7 +56,9 @@ apache_vhost_create() { |
|
|
|
protocols=$(__vhost_cfg_normalize_protocol "$cfg") || return 1 |
|
|
|
fi |
|
|
|
|
|
|
|
domain=$(get_domain "$cfg") && relation-set domain "$domain" |
|
|
|
domain=$(get_domain "$cfg") && { |
|
|
|
[ "$RELATION_DATA_FILE" ] && relation-set domain "$domain" |
|
|
|
} |
|
|
|
|
|
|
|
if is_protocol_enabled https "$protocols"; then |
|
|
|
if [ -z "$domain" ]; then |
|
|
@ -80,6 +82,7 @@ apache_vhost_create() { |
|
|
|
RewriteCond %{HTTPS} off |
|
|
|
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=302,L,QSA] |
|
|
|
" |
|
|
|
[ "$RELATION_DATA_FILE" ] && \ |
|
|
|
relation-set apache-custom-rules "$redirect_rule |
|
|
|
$(if [ "$custom_rules" ]; then |
|
|
|
echo "- |"$'\n'"$(echo "$custom_rules" | prefix " ")" |
|
|
@ -89,13 +92,16 @@ $(if [ "$custom_rules" ]; then |
|
|
|
echo "- |"$'\n'"$(echo "$custom_rules" | prefix " ")" |
|
|
|
fi)")") |
|
|
|
fi |
|
|
|
[ "$RELATION_DATA_FILE" ] && \ |
|
|
|
relation-set protocol https |
|
|
|
else |
|
|
|
## Both services are available and different, don't do anything then ? |
|
|
|
#relation-set protocol https |
|
|
|
#[ "$RELATION_DATA_FILE" ] && \ |
|
|
|
# relation-set protocol https |
|
|
|
: |
|
|
|
fi |
|
|
|
else |
|
|
|
[ "$RELATION_DATA_FILE" ] && \ |
|
|
|
relation-set protocol http |
|
|
|
fi |
|
|
|
vhost_statement=$(apache_vhost_statement "$type" "$protocols" "$cfg" "$domain") || { |
|
|
|