New config path. New permission policy. Improved rebuild scripts.

This commit is contained in:
Serghey Rodin 2012-02-14 18:41:09 +02:00
commit bee8009b4b
21 changed files with 323 additions and 62 deletions

View file

@ -136,7 +136,6 @@ update_domain_zone() {
# Definigng variables
line=$(grep "DOMAIN='$domain'" $V_USERS/$user/dns.conf)
fields='$RECORD\t$TTL\tIN\t$TYPE\t$VALUE'
conf="/etc/namedb/$domain.db"
# Checking serial
if [ -e $conf ]; then
@ -187,7 +186,6 @@ update_domain_zone() {
VALUE=$(idn --quiet -a -t "$VALUE")
eval echo -e "\"$fields\""|sed -e "s/%quote%/'/g" >> $conf
done < $V_USERS/$user/dns/$domain
}
get_next_dns_record() {
@ -749,10 +747,10 @@ upd_web_domain_values() {
fi
# Defining SSL vars
ssl_crt="$V_HOME/$user/conf/ssl.$domain.crt"
ssl_key="$V_HOME/$user/conf/ssl.$domain.key"
ssl_pem="$V_HOME/$user/conf/ssl.$domain.pem"
ssl_ca="$V_HOME/$user/conf/ssl.$domain.ca"
ssl_crt="$V_HOME/$user/conf/web/ssl.$domain.crt"
ssl_key="$V_HOME/$user/conf/web/ssl.$domain.key"
ssl_pem="$V_HOME/$user/conf/web/ssl.$domain.pem"
ssl_ca="$V_HOME/$user/conf/web/ssl.$domain.ca"
if [ ! -e "$V_USERS/$user/ssl/$domain.ca" ]; then
ssl_ca_str='#'
fi

View file

@ -675,7 +675,7 @@ get_user_value() {
restart_schedule() {
type="$1"
if [ -z "$RESTART_PERIOD" ]; then
$V_BIN/v_restart_"$type"
$V_BIN/v_restart_"$type" "$V_EVENT"
else
echo "$type" >> $V_QUEUE/restart.pipe
fi