github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 21:04:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

default backend

Browse source
This commit is contained in:
Serghey Rodin 2015-10-30 13:53:41 +02:00
commit 45fd7dc75b
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bin/v-add-web-domain
View file

@ -75,6 +75,9 @@ if [ ! -z "$WEB_BACKEND" ]; then
fi fi
get_domain_backend_values get_domain_backend_values
backend=$(get_user_value '$BACKEND_TEMPLATE') backend=$(get_user_value '$BACKEND_TEMPLATE')
if [ -z "$backend" ]; then
backend='default'
fi
fi fi
# Defining variables for add_config function # Defining variables for add_config function

2
bin/v-add-web-domain-backend
View file

@ -13,7 +13,7 @@
user=$1 user=$1
domain=$2 domain=$2
domain_idn=$(idn -t --quiet -a "$domain") domain_idn=$(idn -t --quiet -a "$domain")
template=$3 template=${3-default}
# Includes # Includes
source $VESTA/func/main.sh source $VESTA/func/main.sh

2
func/main.sh
View file

@ -341,7 +341,7 @@ search_objects() {
# Get user value # Get user value
get_user_value() { get_user_value() {
grep "^${1//$/}=" $USER_DATA/user.conf| cut -f 2 -d \' grep "^${1//$/}=" $USER_DATA/user.conf |awk -F "'" '{print $2}'
} }
# Update user value in user.conf # Update user value in user.conf

2
web/add/firewall/index.php
View file

@ -26,7 +26,7 @@ if (!empty($_POST['ok'])) {
// Check empty fields // Check empty fields
if (empty($_POST['v_action'])) $errors[] = __('action'); if (empty($_POST['v_action'])) $errors[] = __('action');
if (empty($_POST['v_protocol'])) $errors[] = __('protocol'); if (empty($_POST['v_protocol'])) $errors[] = __('protocol');
if (empty($_POST['v_port'])) $errors[] = __('port'); if (!isset($_POST['v_port'])) $errors[] = __('port');
if (empty($_POST['v_ip'])) $errors[] = __('ip address'); if (empty($_POST['v_ip'])) $errors[] = __('ip address');
if (!empty($errors[0])) { if (!empty($errors[0])) {
foreach ($errors as $i => $error) { foreach ($errors as $i => $error) {