Skip to content

Commit bee8009

Browse files
serghey-rodinserghey-rodin
committed
New config path. New permission policy. Improved rebuild scripts.
1 parent ad6b4c1 commit bee8009

21 files changed

+323
-62
lines changed

‎bin/v_add_cron_job‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ v_str="$v_str' WDAY='$wday' CMD='$command' SUSPEND='no' DATE='$V_DATE'"
6767
# Adding to crontab
6868
echo "$v_str">>$V_USERS/$user/cron.conf
6969

70+
chmod 660 $V_USERS/$user/cron.conf
71+
7072
# Sorting jobs by id
7173
sort_cron_jobs
7274

‎bin/v_add_db_base‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ increase_user_value "$user" '$U_DATABASES'
9090
# Adding db to db conf
9191
v_str="DB='$database' USER='$db_user' HOST='$host' TYPE='$type'"
9292
v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPEND='no' DATE='$V_DATE'"
93-
echo "$v_str">>$V_USERS/$user/db.conf
93+
echo "$v_str" >> $V_USERS/$user/db.conf
94+
chmod 660 $V_USERS/$user/db.conf
9495

9596
# Hiding password
9697
V_EVENT="$V_DATE $V_SCRIPT $user $database $db_user ***** $type $host"

‎bin/v_add_dns_domain‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,20 @@ cat $V_DNSTPL/$template.tpl |\
103103
dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
104104
dns_rec="$dns_rec SOA='$soa' SUSPEND='no' DATE='$V_DATE'"
105105
echo "$dns_rec" >> $V_USERS/$user/dns.conf
106+
chmod 660 $V_USERS/$user/dns.conf
106107

107108
# Adding zone in named.conf
108-
named="zone \"$domain_idn\" {type master; file \"/etc/namedb/$domain.db\";};"
109+
named="zone \"$domain_idn\" {type master; file"
110+
named="$named \"$V_HOME/$user/conf/dns/$domain.db\";};"
109111
echo "$named" >> /etc/named.conf
110112

111113
# Updating domain dns zone
114+
conf="$V_HOME/$user/conf/dns/$domain.db"
112115
update_domain_zone
113116

117+
chmod 640 $conf
118+
chown root:named $conf
119+
114120

115121
#----------------------------------------------------------#
116122
# Vesta #

‎bin/v_add_user‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,32 @@ esac
7575
echo "$password" | /usr/bin/passwd "$user" --stdin >/dev/null 2>&1
7676

7777
# Building directory tree
78-
if [ ! -z "$BACKUP_SYSTEM" ] && [ "$BACKUP_SYSTEM" != 'no' ]; then
79-
mkdir $V_HOME/$user/backup
80-
chmod 751 $V_HOME/$user/backup
81-
fi
78+
mkdir $V_HOME/$user/conf
79+
chmod 751 $V_HOME/$user/conf/web
8280

8381
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
84-
mkdir $V_HOME/$user/conf
82+
mkdir $V_HOME/$user/conf/web
8583
mkdir $V_HOME/$user/web
8684
mkdir $V_HOME/$user/tmp
87-
chmod 751 $V_HOME/$user/conf
85+
chmod 751 $V_HOME/$user/conf/web
8886
chmod 751 $V_HOME/$user/web
8987
chmod 777 $V_HOME/$user/tmp
9088
chown $user:$user $V_HOME/$user/web
9189
fi
9290

9391
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
92+
mkdir $V_HOME/$user/conf/mail
9493
mkdir $V_HOME/$user/mail
9594
chmod 751 $V_HOME/$user/mail
95+
chmod 751 $V_HOME/$user/conf/mail
96+
fi
97+
98+
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
99+
mkdir $V_HOME/$user/conf/dns
100+
chmod 751 $V_HOME/$user/conf/dns
96101
fi
97102

103+
98104
# Set permissions
99105
chmod -R a+x $V_HOME/$user
100106

@@ -111,36 +117,51 @@ fi
111117

112118
# Adding user dir
113119
mkdir $V_USERS/$user
120+
chmod 770 $V_USERS/$user
114121

115122
# Creating configuration files and pipes
116-
touch $V_USERS/$user/user.conf
123+
touch $V_USERS/$user/backup.conf
124+
chmod 660 $V_USERS/$user/backup.conf
125+
touch $V_USERS/$user/history.log
126+
chmod 660 $V_USERS/$user/history.log
127+
touch $V_USERS/$user/billing.log
128+
chmod 660 $V_USERS/$user/billing.log
129+
117130
echo "v_update_user_disk $user" >> $V_QUEUE/disk.pipe
118131

119132
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
120133
mkdir $V_USERS/$user/ssl
134+
chmod 770 $V_USERS/$user/ssl
121135
touch $V_USERS/$user/web.conf
136+
chmod 660 $V_USERS/$user/web.conf
122137
echo "$V_BIN/v_update_web_domains_traff $user" >> $V_QUEUE/traffic.pipe
123138
echo "v_update_web_domains_disk $user" >> $V_QUEUE/disk.pipe
124139
fi
125140

126141
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
127-
touch $V_USERS/$user/dns.conf
128142
mkdir $V_USERS/$user/dns
143+
chmod 770 $V_USERS/$user/dns
144+
touch $V_USERS/$user/dns.conf
145+
chmod 660 $V_USERS/$user/dns.conf
129146
fi
130147

131148
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
132-
touch $V_USERS/$user/mail_domains.conf
133-
touch $V_USERS/$user/mail_boxes.conf
149+
mkdir $V_USERS/$user/mail
150+
chmod 770 $V_USERS/$user/mail
151+
touch $V_USERS/$user/mail.conf
152+
chmod 660 $V_USERS/$user/mail.conf
134153
echo "v_upd_mail_domains_disk $user" >> $V_QUEUE/disk.pipe
135154
fi
136155

137156
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
138157
touch $V_USERS/$user/db.conf
158+
chmod 660 $V_USERS/$user/db.conf
139159
echo "v_update_db_bases_disk $user" >> $V_QUEUE/disk.pipe
140160
fi
141161

142162
if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
143163
touch $V_USERS/$user/cron.conf
164+
chmod 660 $V_USERS/$user/cron.conf
144165
fi
145166

146167
# Filling user config
@@ -163,6 +184,7 @@ U_DATABASES='0'
163184
U_MAIL_DOMAINS='0'
164185
U_CRON_JOBS='0'
165186
DATE='$V_DATE'" > $V_USERS/$user/user.conf
187+
chmod 660 $V_USERS/$user/user.conf
166188

167189
# Hiding password
168190
V_EVENT="$V_DATE $V_SCRIPT $user ***** $email $package $fname $lname"

‎bin/v_add_web_domain‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ email="$user@$domain"
9999
docroot="$V_HOME/$user/web/$domain/public_html"
100100
docroot_string="DocumentRoot $docroot"
101101

102-
conf="$V_HOME/$user/conf/httpd.conf"
102+
conf="$V_HOME/$user/conf/web/httpd.conf"
103103
tpl_file="$V_WEBTPL/apache_$template.tpl"
104104

105105
# Parsing template keys
@@ -167,8 +167,10 @@ done
167167
# Changing file owner
168168
chown -R $user:$user $V_HOME/$user/web/$domain
169169
chown root:$user /var/log/httpd/domains/$domain.*
170+
chown root:apache $conf
170171

171172
# Changing file permissions
173+
chmod 640 $conf
172174
chmod 551 $V_HOME/$user/web/$domain
173175
chmod 751 $V_HOME/$user/web/$domain/private
174176
chmod 751 $V_HOME/$user/web/$domain/cgi-bin
@@ -218,7 +220,8 @@ v_str="$v_str SSL='no' SSL_HOME='single'"
218220
v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
219221

220222
# Registering domain
221-
echo "$v_str" >>$V_USERS/$user/web.conf
223+
echo "$v_str" >> $V_USERS/$user/web.conf
224+
chmod 660 $V_USERS/$user/web.conf
222225

223226
# Adding task to the vesta pipe
224227
restart_schedule 'web'

‎bin/v_add_web_domain_nginx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,33 @@ get_web_domain_values
6767
NGINX="$template"
6868
NGINX_EXT="$extentions"
6969
tpl_file="$V_WEBTPL/ngingx_vhost_$NGINX.tpl"
70-
conf="$V_HOME/$user/conf/nginx.conf"
70+
conf="$V_HOME/$user/conf/web/nginx.conf"
7171

7272
# Preparing domain values for the template substitution
7373
upd_web_domain_values
7474
add_web_config
7575

76+
# Set permission and ownership
77+
chown root:nginx $conf
78+
chmod 640 $conf
79+
7680
# Checking main vesta httpd config
7781
main_conf='/etc/nginx/conf.d/vesta_users.conf'
7882
main_conf_check=$(grep "$conf" $main_conf )
7983
if [ -z "$main_conf_check" ]; then
8084
echo "include $conf;" >>$main_conf
8185
fi
8286

83-
87+
# Checking ssl
8488
if [ "$SSL" = 'yes' ]; then
8589
proxy_string="proxy_pass https://$ip:$WEB_SSL_PORT;"
8690
tpl_file="$V_WEBTPL/ngingx_vhost_$NGINX.stpl"
87-
conf="$V_HOME/$user/conf/snginx.conf"
91+
conf="$V_HOME/$user/conf/web/snginx.conf"
8892
add_web_config
8993

94+
chown root:nginx $conf
95+
chmod 640 $conf
96+
9097
main_conf='/etc/nginx/conf.d/vesta_users.conf'
9198
main_conf_check=$(grep "$conf" $main_conf )
9299
if [ -z "$main_conf_check" ]; then
@@ -95,6 +102,7 @@ if [ "$SSL" = 'yes' ]; then
95102
fi
96103

97104

105+
98106
#----------------------------------------------------------#
99107
# Vesta #
100108
#----------------------------------------------------------#

‎bin/v_add_web_domain_ssl‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
7676
cp -f $ssl_dir/$domain.ca $V_USERS/$user/ssl/$domain.ca
7777
cat $V_USERS/$user/ssl/$domain.ca >> $V_USERS/$user/ssl/$domain.pem
7878
fi
79+
chmod 660 $V_USERS/$user/ssl/$domain.*
7980

8081
# Parsing domain values
8182
get_web_domain_values
82-
conf="$V_HOME/$user/conf/shttpd.conf"
83+
conf="$V_HOME/$user/conf/web/shttpd.conf"
8384
tpl_file="$V_WEBTPL/apache_$TPL.stpl"
8485
SSL_HOME="$ssl_home"
8586

@@ -92,12 +93,15 @@ upd_web_domain_values
9293
# Adding domain to the shttpd.conf
9394
add_web_config
9495

96+
chown root:apache $conf
97+
chmod 640 $conf
98+
9599
# Adding certificate to user dir
96-
cp -f $V_USERS/$user/ssl/$domain.crt $V_HOME/$user/conf/ssl.$domain.crt
97-
cp -f $V_USERS/$user/ssl/$domain.key $V_HOME/$user/conf/ssl.$domain.key
98-
cp -f $V_USERS/$user/ssl/$domain.pem $V_HOME/$user/conf/ssl.$domain.pem
100+
cp -f $V_USERS/$user/ssl/$domain.crt $V_HOME/$user/conf/web/ssl.$domain.crt
101+
cp -f $V_USERS/$user/ssl/$domain.key $V_HOME/$user/conf/web/ssl.$domain.key
102+
cp -f $V_USERS/$user/ssl/$domain.pem $V_HOME/$user/conf/web/ssl.$domain.pem
99103
if [ -e "$V_USERS/$user/ssl/$domain.ca" ]; then
100-
cp -f $V_USERS/$user/ssl/$domain.ca $V_HOME/$user/conf/ssl.$domain.ca
104+
cp -f $V_USERS/$user/ssl/$domain.ca $V_HOME/$user/conf/web/ssl.$domain.ca
101105
fi
102106

103107
# Running template trigger
@@ -115,10 +119,13 @@ fi
115119
# Checking nginx
116120
if [ ! -z "$NGINX" ]; then
117121
# Adding domain to the snginx.conf
118-
conf="$V_HOME/$user/conf/snginx.conf"
122+
conf="$V_HOME/$user/conf/web/snginx.conf"
119123
tpl_file="$V_WEBTPL/ngingx_vhost_$NGINX.stpl"
120124
add_web_config
121125

126+
chown root:nginx $conf
127+
chmod 640 $conf
128+
122129
# Checking vesta nginx config
123130
main_conf='/etc/nginx/conf.d/vesta_users.conf'
124131
main_conf_check=$(grep "$conf" $main_conf )

‎bin/v_add_web_domain_stat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ cat $V_WEBTPL/$type.tpl |\
8181
-e "s/%home%/${V_HOME////\/}/g" \
8282
-e "s/%alias%/${aliases//,/ }/g" \
8383
-e "s/%alias_idn%/${aliases_idn//,/ }/g" \
84-
> $V_HOME/$user/conf/$type.$domain.conf
84+
> $V_HOME/$user/conf/web/$type.$domain.conf
8585

8686

8787
#----------------------------------------------------------#

‎bin/v_backup_user‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ backup_str="$backup_str MAIL='${mail_list// /,}'"
503503
backup_str="$backup_str DB='${db_list// /,}'"
504504
backup_str="$backup_str CRON='$cron_list'"
505505
echo "$backup_str" >> $V_USERS/$user/backup.conf
506+
chmod 660 $V_USERS/$user/backup.conf
506507

507508
# Logging
508509
log_event 'system' "$V_EVENT"

‎bin/v_delete_dns_domain‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ tpl_name=$(get_dns_domain_value '$TPL')
5454
old_ip=$(get_dns_domain_value '$IP')
5555

5656
# Deleting domain in named.conf
57-
rm_string=$(grep -n /etc/namedb/$domain.db $named_conf|cut -d : -f 1)
57+
rm_string=$(grep -n /conf/dns/$domain.db $named_conf |cut -d : -f 1)
5858
if [ ! -z "$rm_string" ]; then
5959
sed -i "$rm_string d" $named_conf
6060
fi
6161

62-
if [ -e "/etc/namedb/$domain.db" ]; then
63-
rm -f /etc/namedb/$domain.db
62+
if [ -e "$V_HOME/$user/conf/dns/$domain.db" ]; then
63+
rm -f $V_HOME/$user/conf/dns/$domain.db
6464
fi
6565

6666

0 commit comments

Comments
 (0)