Skip to content

Commit 311146a

Browse files
serghey-rodinserghey-rodin
committed
Remote DNS support
1 parent fded642 commit 311146a

13 files changed

+73
-56
lines changed

‎bin/v-add-dns-domain‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -117,34 +117,30 @@ dns_rec="$dns_rec DATE='$DATE'"
117117
echo "$dns_rec" >> $USER_DATA/dns.conf
118118
chmod 660 $USER_DATA/dns.conf
119119

120-
# Get dns config path
121-
if [ -e '/etc/named.conf' ]; then
122-
dns_conf='/etc/named.conf'
123-
fi
124-
125-
if [ -e '/etc/bind/named.conf' ]; then
126-
dns_conf='/etc/bind/named.conf'
127-
fi
120+
# Create system configs
121+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
122+
if [ -e '/etc/named.conf' ]; then
123+
dns_conf='/etc/named.conf'
124+
dns_group='named'
125+
else
126+
dns_conf='/etc/bind/named.conf'
127+
dns_group='bind'
128+
fi
128129

129-
# Adding zone in named.conf
130-
named="zone \"$domain_idn\" {type master; file"
131-
named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
132-
echo "$named" >> $dns_conf
130+
# Adding zone in named.conf
131+
named="zone \"$domain_idn\" {type master; file"
132+
named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
133+
echo "$named" >> $dns_conf
133134

134-
# Updating domain dns zone
135-
update_domain_zone
135+
# Updating domain dns zone
136+
update_domain_zone
136137

137-
# Set permissions
138-
if [ "$DNS_SYSTEM" = 'named' ]; then
139-
dns_group='named'
140-
else
141-
dns_group='bind'
138+
# Set permissions
139+
chmod 640 $conf
140+
chown root:$dns_group $conf
142141
fi
143142

144-
chmod 640 $conf
145-
chown root:$dns_group $conf
146-
147-
# dns-cluster
143+
# Updating dns-cluster queue
148144
if [ ! -z "$DNS_CLUSTER" ]; then
149145
cmd="$BIN/v-add-remote-dns-domain $user $domain no"
150146
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe

‎bin/v-add-dns-record‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ chmod 660 $zone
8181
sort_dns_records
8282

8383
# Updating zone
84-
update_domain_zone
84+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
85+
update_domain_zone
86+
fi
8587

86-
# dns-cluster
88+
# Updating dns-cluster queue
8789
if [ ! -z "$DNS_CLUSTER" ]; then
8890
# Check for first sync
8991
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-domain-exp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
4141
# Changing exp
4242
update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp"
4343

44-
# dns-cluster
44+
# Updating dns-cluster queue
4545
if [ ! -z "$DNS_CLUSTER" ]; then
4646
# Check for first sync
4747
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-domain-ip‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$IP' "$ip"
5050
sed -i "s/$old/$ip/g" $USER_DATA/dns/$domain.conf
5151

5252
# Updating zone
53-
update_domain_zone
53+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
54+
update_domain_zone
55+
fi
5456

55-
# dns-cluster
57+
# Updating dns-cluster queue
5658
if [ ! -z "$DNS_CLUSTER" ]; then
5759
# Check for first sync
5860
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-domain-soa‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
4444
update_object_value 'dns' 'DOMAIN' "$domain" '$SOA' "$soa"
4545

4646
# Updating zone
47-
update_domain_zone
47+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
48+
update_domain_zone
49+
fi
4850

49-
# dns-cluster
51+
# Updating dns-cluster queue
5052
if [ ! -z "$DNS_CLUSTER" ]; then
5153
# Check for first sync
5254
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-domain-tpl‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ for nameserver in ${ns//,/ };do
5353
done
5454

5555
# Changing tpl
56-
update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
57-
58-
# Adding zone to dns dir
5956
cat $DNSTPL/$template.tpl |\
6057
sed -e "s/%ip%/$ip/g" \
6158
-e "s/%domain_idn%/$domain_idn/g" \
@@ -66,11 +63,14 @@ cat $DNSTPL/$template.tpl |\
6663
-e "s/%ns4%/$ns4/g" \
6764
-e "s/%time%/$TIME/g" \
6865
-e "s/%date%/$DATE/g" > $USER_DATA/dns/$domain.conf
66+
records="$(wc -l $USER_DATA/dns/$domain.conf |cut -f 1 -d ' ')"
6967

7068
# Updating zone
71-
update_domain_zone
69+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
70+
update_domain_zone
71+
fi
7272

73-
# dns-cluster
73+
# Updating dns-cluster queue
7474
if [ ! -z "$DNS_CLUSTER" ]; then
7575
# Check for first sync
7676
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
@@ -85,6 +85,10 @@ fi
8585
# Vesta #
8686
#----------------------------------------------------------#
8787

88+
# Updating vesta config
89+
update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
90+
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
91+
8892
# Restart named
8993
if [ "$restart" != 'no' ]; then
9094
$BIN/v-restart-dns

‎bin/v-change-dns-domain-ttl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
4343
update_object_value 'dns' 'DOMAIN' "$domain" '$TTL' "$ttl"
4444

4545
# Updating zone
46-
update_domain_zone
46+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
47+
update_domain_zone
48+
fi
4749

48-
# dns-cluster
50+
# Updating dns-cluster queue
4951
if [ ! -z "$DNS_CLUSTER" ]; then
5052
# Check for first sync
5153
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-record‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,11 @@ echo "$dns_rec" >> $USER_DATA/dns/$domain.conf
7777
sort_dns_records
7878

7979
# Updating zone
80-
update_domain_zone
80+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
81+
update_domain_zone
82+
fi
8183

82-
# dns-cluster
84+
# Updating dns-cluster queue
8385
if [ ! -z "$DNS_CLUSTER" ]; then
8486
# Check for first sync
8587
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-change-dns-record-id‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ sed -i "s/^ID='$id'/ID='$newid'/" $USER_DATA/dns/$domain.conf
5050
sort_dns_records
5151

5252
# Updating zone
53-
update_domain_zone
53+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
54+
update_domain_zone
55+
fi
5456

55-
# dns-cluster
57+
# Updating dns-cluster queue
5658
if [ ! -z "$DNS_CLUSTER" ]; then
5759
# Check for first sync
5860
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)

‎bin/v-delete-dns-domain‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,19 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
4040

4141
records=$(wc -l $USER_DATA/dns/$domain.conf | cut -f 1 -d ' ')
4242

43-
# Get dns config path
44-
if [ -e '/etc/named.conf' ]; then
45-
dns_conf='/etc/named.conf'
46-
fi
43+
# Deleting system configs
44+
if [[ "$DNS_SYSTEM" =~ named|bind ]]; then
45+
if [ -e '/etc/named.conf' ]; then
46+
dns_conf='/etc/named.conf'
47+
else
48+
dns_conf='/etc/bind/named.conf'
49+
fi
4750

48-
if [ -e '/etc/bind/named.conf' ]; then
49-
dns_conf='/etc/bind/named.conf'
51+
sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
52+
rm -f $HOMEDIR/$user/conf/dns/$domain.db
5053
fi
5154

52-
# Deleting domain in named.conf
53-
sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
54-
rm -f $HOMEDIR/$user/conf/dns/$domain.db
55-
56-
# dns-cluster
55+
# Updating dns-cluster queue
5756
if [ ! -z "$DNS_CLUSTER" ]; then
5857
cmd="$BIN/v-delete-remote-dns-domain $user $domain"
5958
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe

0 commit comments

Comments
 (0)