diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index fd3b2b401..908d1ebd0 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -134,7 +134,7 @@ chown root:apache $conf chmod 660 $conf chmod 551 $HOMEDIR/$user/web/$domain chmod 771 $HOMEDIR/$user/web/$domain/private -chmod 771 $HOMEDIR/$user/web/$domain/cgi-bin +chmod 751 $HOMEDIR/$user/web/$domain/cgi-bin chmod 771 $HOMEDIR/$user/web/$domain/public_html chmod 771 $HOMEDIR/$user/web/$domain/public_shtml chmod 771 $HOMEDIR/$user/web/$domain/document_errors diff --git a/install/0.9.7/rhel/templates/web/apache_default.stpl b/install/0.9.7/rhel/templates/web/apache_default.stpl index 84dcd5498..71c0fe8a8 100755 --- a/install/0.9.7/rhel/templates/web/apache_default.stpl +++ b/install/0.9.7/rhel/templates/web/apache_default.stpl @@ -34,7 +34,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_default.tpl b/install/0.9.7/rhel/templates/web/apache_default.tpl index dac4a3828..3d3fb0161 100755 --- a/install/0.9.7/rhel/templates/web/apache_default.tpl +++ b/install/0.9.7/rhel/templates/web/apache_default.tpl @@ -28,7 +28,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_hosting.stpl b/install/0.9.7/rhel/templates/web/apache_hosting.stpl index c57ea7318..2fb41ba8f 100755 --- a/install/0.9.7/rhel/templates/web/apache_hosting.stpl +++ b/install/0.9.7/rhel/templates/web/apache_hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_hosting.tpl b/install/0.9.7/rhel/templates/web/apache_hosting.tpl index d607a4279..e170b0e7c 100755 --- a/install/0.9.7/rhel/templates/web/apache_hosting.tpl +++ b/install/0.9.7/rhel/templates/web/apache_hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl b/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl index a6488328b..4a4a386c0 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl +++ b/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl @@ -28,7 +28,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl b/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl index b9b34c8b1..ce58bf2b8 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl +++ b/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl @@ -21,7 +21,7 @@ AllowOverride All - Include %home%/%user%/conf/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl index 243f8efed..1fd9c8cdd 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl +++ b/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl @@ -29,7 +29,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain%.conf* diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl index 0bae204dc..2bca8ac76 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl +++ b/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl @@ -21,7 +21,7 @@ AllowOverride All - Include %home%/%user%/conf/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/vst-install.sh b/install/vst-install.sh index aa27c159a..cf2867d77 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -14,7 +14,7 @@ tools="screen mc libpng libjpeg curl curl libmcrypt libmcrypt mhash mhash freetype openssl flex libxml2 ImageMagick sqlite sqlite pcre pcre sudo bc mailx lsof ntp tar whois telnet rsync" -rpms="nginx httpd mod_ssl mod_ruid2 mod_extract_forwarded ftp +rpms="nginx httpd mod_ssl mod_ruid2 mod_extract_forwarded mod_fcgid ftp webalizer awstats mysql mysql-server php php-bcmath php-cli php-common php-gd php-imap php-mbstring php-mcrypt php-mysql php-pdo php-soap php-tidy php-xml php-xmlrpc phpMyAdmin exim dovecot clamd spamassassin roundcubemail