|
@ -61,12 +61,14 @@ export -f apache_publish_dir |
|
|
## |
|
|
## |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
apache_vhost_create() { |
|
|
apache_vhost_create() { |
|
|
local type="$1" cfg="$2" protocols="$3" dest="$4" custom_rules vhost_statement creds |
|
|
|
|
|
|
|
|
local type="$1" cfg="$2" protocols="$3" dest="$4" custom_rules vhost_statement creds \ |
|
|
|
|
|
redirect domain ssl_plugin_fun ssl_cfg_value ssl_cfg_options |
|
|
|
|
|
|
|
|
export APACHE_CONFIG_LOCATION="$SERVICE_CONFIGSTORE/etc/apache2/sites-enabled" |
|
|
export APACHE_CONFIG_LOCATION="$SERVICE_CONFIGSTORE/etc/apache2/sites-enabled" |
|
|
|
|
|
|
|
|
|
|
|
if [ "$cfg" == "None" ]; then |
|
|
|
|
|
cfg= |
|
|
|
|
|
fi |
|
|
if [ -z "$protocols" ]; then |
|
|
if [ -z "$protocols" ]; then |
|
|
protocols=$(__vhost_cfg_normalize_protocol "$cfg") || return 1 |
|
|
protocols=$(__vhost_cfg_normalize_protocol "$cfg") || return 1 |
|
|
fi |
|
|
fi |
|
@ -105,7 +107,7 @@ $(if [ "$custom_rules" ]; then |
|
|
cfg=$(merge_yaml_str "$cfg" "$(yaml_key_val_str "apache-custom-rules" "$redirect_rule |
|
|
cfg=$(merge_yaml_str "$cfg" "$(yaml_key_val_str "apache-custom-rules" "$redirect_rule |
|
|
$(if [ "$custom_rules" ]; then |
|
|
$(if [ "$custom_rules" ]; then |
|
|
echo "- |"$'\n'"$(echo "$custom_rules" | prefix " ")" |
|
|
echo "- |"$'\n'"$(echo "$custom_rules" | prefix " ")" |
|
|
fi)")") |
|
|
|
|
|
|
|
|
fi)")") || return 1 |
|
|
fi |
|
|
fi |
|
|
[ "$RELATION_DATA_FILE" ] && \ |
|
|
[ "$RELATION_DATA_FILE" ] && \ |
|
|
relation-set protocol https |
|
|
relation-set protocol https |
|
|