diff --git a/README.md b/README.md index 6d65378fd..d0fdbe4c9 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [Vesta Control Panel](http://vestacp.com/) ================================================== -* Vesta is the open source hosting control panel. -* Vesta is the clean and focused interface without the clutter. -* Vesta is the latest very innovative technologies. +* Vesta is an open source hosting control panel. +* Vesta has a clean and focused interface without the clutter. +* Vesta has the latest of very innovative technologies. How to install @@ -13,7 +13,7 @@ Connect to your server as root via SSH ssh root@your.server ``` -Download installation script +Download the installation script ```bash curl -O http://vestacp.com/pub/vst-install.sh ``` diff --git a/bin/v-add-domain b/bin/v-add-domain index 24a9194e3..d7de66891 100755 --- a/bin/v-add-domain +++ b/bin/v-add-domain @@ -47,7 +47,7 @@ if [ -z "$ip" ]; then fi fi -# Web dmain +# Web domain if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $BIN/v-add-web-domain $user $domain $ip retun_code=$? diff --git a/install/0.9.8/rhel/apc.ini b/install/rhel/apc.ini similarity index 100% rename from install/0.9.8/rhel/apc.ini rename to install/rhel/apc.ini diff --git a/install/0.9.8/rhel/clamd.conf b/install/rhel/clamd.conf similarity index 100% rename from install/0.9.8/rhel/clamd.conf rename to install/rhel/clamd.conf diff --git a/install/0.9.8/rhel/dnsbl.conf b/install/rhel/dnsbl.conf similarity index 100% rename from install/0.9.8/rhel/dnsbl.conf rename to install/rhel/dnsbl.conf diff --git a/install/0.9.8/rhel/dovecot.conf b/install/rhel/dovecot.conf similarity index 100% rename from install/0.9.8/rhel/dovecot.conf rename to install/rhel/dovecot.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/10-auth.conf b/install/rhel/dovecot/conf.d/10-auth.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/10-auth.conf rename to install/rhel/dovecot/conf.d/10-auth.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/10-logging.conf b/install/rhel/dovecot/conf.d/10-logging.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/10-logging.conf rename to install/rhel/dovecot/conf.d/10-logging.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/10-mail.conf b/install/rhel/dovecot/conf.d/10-mail.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/10-mail.conf rename to install/rhel/dovecot/conf.d/10-mail.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/10-master.conf b/install/rhel/dovecot/conf.d/10-master.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/10-master.conf rename to install/rhel/dovecot/conf.d/10-master.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/10-ssl.conf b/install/rhel/dovecot/conf.d/10-ssl.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/10-ssl.conf rename to install/rhel/dovecot/conf.d/10-ssl.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/20-imap.conf b/install/rhel/dovecot/conf.d/20-imap.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/20-imap.conf rename to install/rhel/dovecot/conf.d/20-imap.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/20-pop3.conf b/install/rhel/dovecot/conf.d/20-pop3.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/20-pop3.conf rename to install/rhel/dovecot/conf.d/20-pop3.conf diff --git a/install/0.9.8/rhel/dovecot/conf.d/auth-passwdfile.conf.ext b/install/rhel/dovecot/conf.d/auth-passwdfile.conf.ext similarity index 100% rename from install/0.9.8/rhel/dovecot/conf.d/auth-passwdfile.conf.ext rename to install/rhel/dovecot/conf.d/auth-passwdfile.conf.ext diff --git a/install/0.9.8/rhel/dovecot/dovecot.conf b/install/rhel/dovecot/dovecot.conf similarity index 100% rename from install/0.9.8/rhel/dovecot/dovecot.conf rename to install/rhel/dovecot/dovecot.conf diff --git a/install/rhel/exim-smarthost.conf b/install/rhel/exim-smarthost.conf new file mode 100644 index 000000000..1acae8cc9 --- /dev/null +++ b/install/rhel/exim-smarthost.conf @@ -0,0 +1,345 @@ +########################################################################## +#SPAMASSASSIN = yes +SPAM_SCORE = 10 +#CLAMD = yes +########################################################################## + +domainlist local_domains = dsearch;/etc/exim/domains/ +domainlist relay_to_domains = dsearch;/etc/exim/domains/ +hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf +hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf +no_local_from_check +untrusted_set_sender = * +acl_smtp_connect = acl_check_spammers +acl_smtp_mail = acl_check_mail +acl_smtp_rcpt = acl_check_rcpt +acl_smtp_data = acl_check_data +acl_smtp_mime = acl_check_mime + +.ifdef SPAMASSASSIN +spamd_address = 127.0.0.1 783 +.endif + +.ifdef CLAMD +av_scanner = clamd: /var/run/clamav/clamd.sock +.endif + +tls_advertise_hosts = * +tls_certificate = /etc/pki/tls/certs/exim.pem +tls_privatekey = /etc/pki/tls/private/exim.pem + +daemon_smtp_ports = 25 : 465 : 587 : 2525 +tls_on_connect_ports = 465 +never_users = root +host_lookup = * +rfc1413_hosts = * +rfc1413_query_timeout = 5s +ignore_bounce_errors_after = 2d +timeout_frozen_after = 7d + +DKIM_DOMAIN = ${lc:${domain:$h_from:}} +DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem +DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} + + +########################################################################## +begin acl +########################################################################## +acl_check_spammers: + accept hosts = +whitelist + drop message = Your host in blacklist on this server. + log_message = Host in blacklist + hosts = +spammers + deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text + dnslists = ${readfile {/etc/exim/dnsbl.conf}{:}} + accept + +acl_check_mail: + deny + condition = ${if eq{$sender_helo_name}{}} + message = HELO required before MAIL +# drop +# condition = ${if isip{$sender_helo_name}} +# message = Access denied - Invalid HELO name (See RFC2821 4.1.3) + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} + condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} + delay = 45s +# drop +# condition = ${if match{$sender_helo_name}{\N^\[\N}{no}{yes}} +# condition = ${if match{$sender_helo_name}{\N\.\N}{no}{yes}} +# message = Access denied - Invalid HELO name (See RFC2821 4.1.1.1) + drop + condition = ${if isip{$sender_helo_name}} + message = Access denied - Invalid HELO name (See RFC2821 4.1.3) +# drop +# condition = ${if match{$sender_helo_name}{\N\.$\N}} +# message = Access denied - Invalid HELO name (See RFC2821 4.1.1.1) +# drop message = "REJECTED - Bad HELO - Host impersonating [$sender_helo_name]" +# condition = ${if match{$sender_helo_name}{$primary_hostname}} + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} + message = $interface_address is _my_ address + accept + + +acl_check_rcpt: + accept hosts = : + + deny message = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] + + deny message = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + + require verify = sender + + accept hosts = +relay_from_hosts + control = submission + + accept authenticated = * + control = submission/domain= + + require message = relay not permitted + domains = +local_domains : +relay_to_domains + + deny message = smtp auth requried + sender_domains = +local_domains + !authenticated = * + + require verify = recipient + +.ifdef CLAMD + warn set acl_m0 = no + warn condition = ${if exists {/etc/exim/domains/$domain/antivirus}{yes}{no}} + set acl_m0 = yes +.endif +.ifdef SPAMASSASSIN + warn set acl_m1 = no + warn condition = ${if exists {/etc/exim/domains/$domain/antispam}{yes}{no}} + set acl_m1 = yes +.endif + accept + + +acl_check_data: +.ifdef CLAMD + deny message = Message contains a virus ($malware_name) and has been rejected + malware = * + condition = ${if eq{$acl_m0}{yes}{yes}{no}} +.endif + +.ifdef SPAMASSASSIN + warn + !authenticated = * + hosts = !+relay_from_hosts + condition = ${if < {$message_size}{100K}} + condition = ${if eq{$acl_m1}{yes}{yes}{no}} + spam = nobody:true/defer_ok + add_header = X-Spam-Score: $spam_score_int + add_header = X-Spam-Bar: $spam_bar + add_header = X-Spam-Report: $spam_report + set acl_m2 = $spam_score_int + warn + condition = ${if !eq{$acl_m2}{} {yes}{no}} + condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} + add_header = X-Spam-Status: Yes + message = SpamAssassin detected spam (from $sender_address to $recipients). +.endif + accept + + +acl_check_mime: + deny message = Blacklisted file extension detected + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} + accept + +########################################################################## +begin authenticators +########################################################################## +login: + driver = plaintext + public_name = LOGIN + client_send = ": user@smartrelay.vestacp.com : p4sw0rd" + server_set_id = $auth1 + +dovecot_plain: + driver = dovecot + public_name = PLAIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + +dovecot_login: + driver = dovecot + public_name = LOGIN + server_socket = /var/run/dovecot/auth-client + server_set_id = $auth1 + + +########################################################################## +begin routers +########################################################################## +smarthost: + driver = manualroute + domains = ! +local_domains + transport = remote_smtp_auth + route_list = * smartrelay.vestacp.com + +dnslookup: + driver = dnslookup + domains = !+local_domains + transport = remote_smtp + no_more + +userforward: + driver = redirect + check_local_user + file = $home/.forward + allow_filter + no_verify + no_expn + check_ancestor + file_transport = address_file + pipe_transport = address_pipe + reply_transport = address_reply + +procmail: + driver = accept + check_local_user + require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail + transport = procmail + no_verify + +autoreplay: + driver = accept + require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg + condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}} + retry_use_local_part + transport = userautoreply + unseen + +aliases: + driver = redirect + headers_add = X-redirected: yes + data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + require_files = /etc/exim/domains/$domain/aliases + redirect_router = dnslookup + pipe_transport = address_pipe + unseen + +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{yes}{no_such_user}}}} + +localuser: + driver = accept + transport = local_delivery + condition = ${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}{true}{false}} + +catchall: + driver = redirect + headers_add = X-redirected: yes + require_files = /etc/exim/domains/$domain/aliases + data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim/domains/$domain/aliases}}}} + file_transport = local_delivery + redirect_router = dnslookup + +terminate_alias: + driver = accept + transport = devnull + condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}} + + +########################################################################## +begin transports +########################################################################## +remote_smtp: + driver = smtp + dkim_domain = DKIM_DOMAIN + dkim_selector = mail + dkim_private_key = DKIM_PRIVATE_KEY + dkim_canon = relaxed + dkim_strict = 0 + +remote_smtp_auth: + driver = smtp + hosts = smartrelay.vestacp.com + hosts_require_auth = smartrelay.vestacp.com + +procmail: + driver = pipe + command = "/usr/bin/procmail -d $local_part" + return_path_add + delivery_date_add + envelope_to_add + user = $local_part + initgroups + return_output + +local_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_warn_threshold = 75% + +local_spam_delivery: + driver = appendfile + maildir_format + maildir_use_size_file + user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}} + group = mail + create_directory + directory_mode = 770 + mode = 660 + use_lockfile = no + delivery_date_add + envelope_to_add + return_path_add + directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part/.spam" + quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}M + quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim/domains/$domain/passwd}}}}/mail/$domain/$local_part" + quota_warn_threshold = 75% + +address_pipe: + driver = pipe + return_output + +address_file: + driver = appendfile + delivery_date_add + envelope_to_add + return_path_add + +address_reply: + driver = autoreply + +userautoreply: + driver = autoreply + file = /etc/exim/domains/$domain/autoreply.${local_part}.msg + from = "${local_part}@${domain}" + subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}" + to = "${sender_address}" + +devnull: + driver = appendfile + file = /dev/null + +########################################################################## +begin retry +* * F,2h,15m; G,16h,1h,1.5; F,4d,6h +########################################################################## +begin rewrite diff --git a/install/0.9.8/rhel/exim.conf b/install/rhel/exim.conf similarity index 100% rename from install/0.9.8/rhel/exim.conf rename to install/rhel/exim.conf diff --git a/install/0.9.8/rhel/freshclam.conf b/install/rhel/freshclam.conf similarity index 100% rename from install/0.9.8/rhel/freshclam.conf rename to install/rhel/freshclam.conf diff --git a/install/0.9.8/rhel/httpd-pma.conf b/install/rhel/httpd-pma.conf similarity index 100% rename from install/0.9.8/rhel/httpd-pma.conf rename to install/rhel/httpd-pma.conf diff --git a/install/0.9.8/rhel/httpd-ssl.conf b/install/rhel/httpd-ssl.conf similarity index 100% rename from install/0.9.8/rhel/httpd-ssl.conf rename to install/rhel/httpd-ssl.conf diff --git a/install/0.9.8/rhel/httpd-status.conf b/install/rhel/httpd-status.conf similarity index 100% rename from install/0.9.8/rhel/httpd-status.conf rename to install/rhel/httpd-status.conf diff --git a/install/0.9.8/rhel/httpd-webmail.conf b/install/rhel/httpd-webmail.conf similarity index 100% rename from install/0.9.8/rhel/httpd-webmail.conf rename to install/rhel/httpd-webmail.conf diff --git a/install/0.9.8/rhel/httpd.conf b/install/rhel/httpd.conf similarity index 100% rename from install/0.9.8/rhel/httpd.conf rename to install/rhel/httpd.conf diff --git a/install/0.9.8/rhel/httpd.log b/install/rhel/httpd.log similarity index 100% rename from install/0.9.8/rhel/httpd.log rename to install/rhel/httpd.log diff --git a/install/0.9.8/rhel/monit/clamd.conf b/install/rhel/monit/clamd.conf similarity index 100% rename from install/0.9.8/rhel/monit/clamd.conf rename to install/rhel/monit/clamd.conf diff --git a/install/0.9.8/rhel/monit/dovecot.conf b/install/rhel/monit/dovecot.conf similarity index 100% rename from install/0.9.8/rhel/monit/dovecot.conf rename to install/rhel/monit/dovecot.conf diff --git a/install/0.9.8/rhel/monit/exim.conf b/install/rhel/monit/exim.conf similarity index 100% rename from install/0.9.8/rhel/monit/exim.conf rename to install/rhel/monit/exim.conf diff --git a/install/0.9.8/rhel/monit/httpd.conf b/install/rhel/monit/httpd.conf similarity index 100% rename from install/0.9.8/rhel/monit/httpd.conf rename to install/rhel/monit/httpd.conf diff --git a/install/0.9.8/rhel/monit/mysql.conf b/install/rhel/monit/mysql.conf similarity index 100% rename from install/0.9.8/rhel/monit/mysql.conf rename to install/rhel/monit/mysql.conf diff --git a/install/0.9.8/rhel/monit/nginx.conf b/install/rhel/monit/nginx.conf similarity index 100% rename from install/0.9.8/rhel/monit/nginx.conf rename to install/rhel/monit/nginx.conf diff --git a/install/0.9.8/rhel/monit/spamassassin.conf b/install/rhel/monit/spamassassin.conf similarity index 100% rename from install/0.9.8/rhel/monit/spamassassin.conf rename to install/rhel/monit/spamassassin.conf diff --git a/install/0.9.8/rhel/monit/sshd.conf b/install/rhel/monit/sshd.conf similarity index 100% rename from install/0.9.8/rhel/monit/sshd.conf rename to install/rhel/monit/sshd.conf diff --git a/install/0.9.8/rhel/monit/vesta-nginx.conf b/install/rhel/monit/vesta-nginx.conf similarity index 100% rename from install/0.9.8/rhel/monit/vesta-nginx.conf rename to install/rhel/monit/vesta-nginx.conf diff --git a/install/0.9.8/rhel/monit/vesta-php.conf b/install/rhel/monit/vesta-php.conf similarity index 100% rename from install/0.9.8/rhel/monit/vesta-php.conf rename to install/rhel/monit/vesta-php.conf diff --git a/install/0.9.8/rhel/mysql-512.cnf b/install/rhel/mysql-512.cnf similarity index 100% rename from install/0.9.8/rhel/mysql-512.cnf rename to install/rhel/mysql-512.cnf diff --git a/install/0.9.8/rhel/mysql.cnf b/install/rhel/mysql.cnf similarity index 100% rename from install/0.9.8/rhel/mysql.cnf rename to install/rhel/mysql.cnf diff --git a/install/0.9.8/rhel/named.conf b/install/rhel/named.conf similarity index 100% rename from install/0.9.8/rhel/named.conf rename to install/rhel/named.conf diff --git a/install/0.9.8/rhel/nginx-status.conf b/install/rhel/nginx-status.conf similarity index 100% rename from install/0.9.8/rhel/nginx-status.conf rename to install/rhel/nginx-status.conf diff --git a/install/0.9.8/rhel/nginx.conf b/install/rhel/nginx.conf similarity index 100% rename from install/0.9.8/rhel/nginx.conf rename to install/rhel/nginx.conf diff --git a/install/0.9.8/rhel/packages/default.pkg b/install/rhel/packages/default.pkg similarity index 100% rename from install/0.9.8/rhel/packages/default.pkg rename to install/rhel/packages/default.pkg diff --git a/install/0.9.8/rhel/packages/gainsboro.pkg b/install/rhel/packages/gainsboro.pkg similarity index 100% rename from install/0.9.8/rhel/packages/gainsboro.pkg rename to install/rhel/packages/gainsboro.pkg diff --git a/install/0.9.8/rhel/packages/palegreen.pkg b/install/rhel/packages/palegreen.pkg similarity index 100% rename from install/0.9.8/rhel/packages/palegreen.pkg rename to install/rhel/packages/palegreen.pkg diff --git a/install/0.9.8/rhel/packages/slategrey.pkg b/install/rhel/packages/slategrey.pkg similarity index 100% rename from install/0.9.8/rhel/packages/slategrey.pkg rename to install/rhel/packages/slategrey.pkg diff --git a/install/0.9.8/rhel/pg_hba.conf b/install/rhel/pg_hba.conf similarity index 100% rename from install/0.9.8/rhel/pg_hba.conf rename to install/rhel/pg_hba.conf diff --git a/install/0.9.8/rhel/pma.conf b/install/rhel/pma.conf similarity index 100% rename from install/0.9.8/rhel/pma.conf rename to install/rhel/pma.conf diff --git a/install/0.9.8/rhel/proftpd.conf b/install/rhel/proftpd.conf similarity index 100% rename from install/0.9.8/rhel/proftpd.conf rename to install/rhel/proftpd.conf diff --git a/install/0.9.8/rhel/roundcube-db.conf b/install/rhel/roundcube-db.conf similarity index 100% rename from install/0.9.8/rhel/roundcube-db.conf rename to install/rhel/roundcube-db.conf diff --git a/install/0.9.8/rhel/roundcube-driver.php b/install/rhel/roundcube-driver.php similarity index 100% rename from install/0.9.8/rhel/roundcube-driver.php rename to install/rhel/roundcube-driver.php diff --git a/install/0.9.8/rhel/roundcube-main.conf b/install/rhel/roundcube-main.conf similarity index 100% rename from install/0.9.8/rhel/roundcube-main.conf rename to install/rhel/roundcube-main.conf diff --git a/install/0.9.8/rhel/roundcube-pw.conf b/install/rhel/roundcube-pw.conf similarity index 100% rename from install/0.9.8/rhel/roundcube-pw.conf rename to install/rhel/roundcube-pw.conf diff --git a/install/0.9.8/rhel/spam-blocks.conf b/install/rhel/spam-blocks.conf similarity index 100% rename from install/0.9.8/rhel/spam-blocks.conf rename to install/rhel/spam-blocks.conf diff --git a/install/0.9.8/rhel/sudoers.conf b/install/rhel/sudoers.conf similarity index 100% rename from install/0.9.8/rhel/sudoers.conf rename to install/rhel/sudoers.conf diff --git a/install/0.9.8/rhel/templates/dns/default.tpl b/install/rhel/templates/dns/default.tpl similarity index 100% rename from install/0.9.8/rhel/templates/dns/default.tpl rename to install/rhel/templates/dns/default.tpl diff --git a/install/0.9.8/rhel/templates/dns/gmail.tpl b/install/rhel/templates/dns/gmail.tpl similarity index 100% rename from install/0.9.8/rhel/templates/dns/gmail.tpl rename to install/rhel/templates/dns/gmail.tpl diff --git a/install/0.9.8/rhel/templates/web/awstats/awstats.tpl b/install/rhel/templates/web/awstats/awstats.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/awstats/awstats.tpl rename to install/rhel/templates/web/awstats/awstats.tpl diff --git a/install/0.9.8/rhel/templates/web/awstats/index.tpl b/install/rhel/templates/web/awstats/index.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/awstats/index.tpl rename to install/rhel/templates/web/awstats/index.tpl diff --git a/install/0.9.8/rhel/templates/web/awstats/nav.tpl b/install/rhel/templates/web/awstats/nav.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/awstats/nav.tpl rename to install/rhel/templates/web/awstats/nav.tpl diff --git a/install/0.9.8/rhel/templates/web/httpd/default.stpl b/install/rhel/templates/web/httpd/default.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/default.stpl rename to install/rhel/templates/web/httpd/default.stpl diff --git a/install/0.9.8/rhel/templates/web/httpd/default.tpl b/install/rhel/templates/web/httpd/default.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/default.tpl rename to install/rhel/templates/web/httpd/default.tpl diff --git a/install/0.9.8/rhel/templates/web/httpd/hosting.stpl b/install/rhel/templates/web/httpd/hosting.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/hosting.stpl rename to install/rhel/templates/web/httpd/hosting.stpl diff --git a/install/0.9.8/rhel/templates/web/httpd/hosting.tpl b/install/rhel/templates/web/httpd/hosting.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/hosting.tpl rename to install/rhel/templates/web/httpd/hosting.tpl diff --git a/install/0.9.8/rhel/templates/web/httpd/phpcgi.sh b/install/rhel/templates/web/httpd/phpcgi.sh similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpcgi.sh rename to install/rhel/templates/web/httpd/phpcgi.sh diff --git a/install/0.9.8/rhel/templates/web/httpd/phpcgi.stpl b/install/rhel/templates/web/httpd/phpcgi.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpcgi.stpl rename to install/rhel/templates/web/httpd/phpcgi.stpl diff --git a/install/0.9.8/rhel/templates/web/httpd/phpcgi.tpl b/install/rhel/templates/web/httpd/phpcgi.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpcgi.tpl rename to install/rhel/templates/web/httpd/phpcgi.tpl diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.sh b/install/rhel/templates/web/httpd/phpfcgid.sh similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpfcgid.sh rename to install/rhel/templates/web/httpd/phpfcgid.sh diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.stpl b/install/rhel/templates/web/httpd/phpfcgid.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpfcgid.stpl rename to install/rhel/templates/web/httpd/phpfcgid.stpl diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.tpl b/install/rhel/templates/web/httpd/phpfcgid.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/httpd/phpfcgid.tpl rename to install/rhel/templates/web/httpd/phpfcgid.tpl diff --git a/install/0.9.8/rhel/templates/web/nginx/caching.stpl b/install/rhel/templates/web/nginx/caching.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/caching.stpl rename to install/rhel/templates/web/nginx/caching.stpl diff --git a/install/0.9.8/rhel/templates/web/nginx/caching.tpl b/install/rhel/templates/web/nginx/caching.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/caching.tpl rename to install/rhel/templates/web/nginx/caching.tpl diff --git a/install/0.9.8/rhel/templates/web/nginx/default.stpl b/install/rhel/templates/web/nginx/default.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/default.stpl rename to install/rhel/templates/web/nginx/default.stpl diff --git a/install/0.9.8/rhel/templates/web/nginx/default.tpl b/install/rhel/templates/web/nginx/default.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/default.tpl rename to install/rhel/templates/web/nginx/default.tpl diff --git a/install/0.9.8/rhel/templates/web/nginx/hosting.sh b/install/rhel/templates/web/nginx/hosting.sh similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/hosting.sh rename to install/rhel/templates/web/nginx/hosting.sh diff --git a/install/0.9.8/rhel/templates/web/nginx/hosting.stpl b/install/rhel/templates/web/nginx/hosting.stpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/hosting.stpl rename to install/rhel/templates/web/nginx/hosting.stpl diff --git a/install/0.9.8/rhel/templates/web/nginx/hosting.tpl b/install/rhel/templates/web/nginx/hosting.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/hosting.tpl rename to install/rhel/templates/web/nginx/hosting.tpl diff --git a/install/0.9.8/rhel/templates/web/nginx/proxy_ip.tpl b/install/rhel/templates/web/nginx/proxy_ip.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/nginx/proxy_ip.tpl rename to install/rhel/templates/web/nginx/proxy_ip.tpl diff --git a/install/0.9.8/rhel/templates/web/skel/document_errors/403.html b/install/rhel/templates/web/skel/document_errors/403.html similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/document_errors/403.html rename to install/rhel/templates/web/skel/document_errors/403.html diff --git a/install/0.9.8/rhel/templates/web/skel/document_errors/404.html b/install/rhel/templates/web/skel/document_errors/404.html similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/document_errors/404.html rename to install/rhel/templates/web/skel/document_errors/404.html diff --git a/install/0.9.8/rhel/templates/web/skel/document_errors/50x.html b/install/rhel/templates/web/skel/document_errors/50x.html similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/document_errors/50x.html rename to install/rhel/templates/web/skel/document_errors/50x.html diff --git a/install/0.9.8/rhel/templates/web/skel/public_html/index.html b/install/rhel/templates/web/skel/public_html/index.html similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/public_html/index.html rename to install/rhel/templates/web/skel/public_html/index.html diff --git a/install/0.9.8/rhel/templates/web/skel/public_html/robots.txt b/install/rhel/templates/web/skel/public_html/robots.txt similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/public_html/robots.txt rename to install/rhel/templates/web/skel/public_html/robots.txt diff --git a/install/0.9.8/rhel/templates/web/skel/public_shtml/index.html b/install/rhel/templates/web/skel/public_shtml/index.html similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/public_shtml/index.html rename to install/rhel/templates/web/skel/public_shtml/index.html diff --git a/install/0.9.8/rhel/templates/web/skel/public_shtml/robots.txt b/install/rhel/templates/web/skel/public_shtml/robots.txt similarity index 100% rename from install/0.9.8/rhel/templates/web/skel/public_shtml/robots.txt rename to install/rhel/templates/web/skel/public_shtml/robots.txt diff --git a/install/0.9.8/rhel/templates/web/suspend/.htaccess b/install/rhel/templates/web/suspend/.htaccess similarity index 100% rename from install/0.9.8/rhel/templates/web/suspend/.htaccess rename to install/rhel/templates/web/suspend/.htaccess diff --git a/install/0.9.8/rhel/templates/web/suspend/index.html b/install/rhel/templates/web/suspend/index.html similarity index 100% rename from install/0.9.8/rhel/templates/web/suspend/index.html rename to install/rhel/templates/web/suspend/index.html diff --git a/install/0.9.8/rhel/templates/web/webalizer/webalizer.tpl b/install/rhel/templates/web/webalizer/webalizer.tpl similarity index 100% rename from install/0.9.8/rhel/templates/web/webalizer/webalizer.tpl rename to install/rhel/templates/web/webalizer/webalizer.tpl diff --git a/install/0.9.8/rhel/vesta.log b/install/rhel/vesta.log similarity index 100% rename from install/0.9.8/rhel/vesta.log rename to install/rhel/vesta.log diff --git a/install/0.9.8/rhel/vsftpd.conf b/install/rhel/vsftpd.conf similarity index 100% rename from install/0.9.8/rhel/vsftpd.conf rename to install/rhel/vsftpd.conf diff --git a/install/0.9.8/rhel/whmcs-module.php b/install/rhel/whmcs-module.php similarity index 100% rename from install/0.9.8/rhel/whmcs-module.php rename to install/rhel/whmcs-module.php