Merge remote-tracking branch 'origin/277-no_default_vhost_template' into pu

etc/alternc/templates/apache2/panel.conf

@@ -1,15 +1,13 @@
+# %%fqdn%%
 <Virtualhost *:80>
   ServerName %%fqdn%%
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   KeepAlive Off
-
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
   RewriteRule ^/(.*)$ https://%%fqdn%%/$1 [R=301,L]
-
 </Virtualhost>
 <VirtualHost *:443>
   DocumentRoot /usr/share/alternc/panel/admin
@@ -18,12 +16,9 @@
   ServerName %%fqdn%%
   RewriteEngine on
   RewriteRule   ^/admin/(.*)  /$1
-
   alias /alternc-sql      /usr/share/phpmyadmin
-
   RewriteEngine On
   RewriteRule ^webmail /webmail-redirect.php [L]
-
   # Mail autoconfig
   RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
   RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
@@ -31,13 +26,10 @@
   RewriteRule ^Autodiscover/Autodiscover.xml$ /mailautoconfig_outlook.php [L]
   RewriteRule ^Autodiscover.xml$ mailautoconfig_outlook.php [L]
   RewriteRule ^autodiscover.xml$ mailautoconfig_outlook.php [L]
-
   # will be used to define aliases such as /javascript /squirrelmail ...
   Include /etc/alternc/apache-panel.d/*.conf
-
   SSLEngine On
   SSLCertificateFile %%CRT%%
   SSLCertificateKeyFile %%KEY%%
   %%CHAINLINE%%
-
 </VirtualHost>

etc/alternc/templates/apache2/url.conf

@@ -1,28 +1,23 @@
+# %%fqdn%%
 <Virtualhost *:80>
   ServerName %%fqdn%%
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   KeepAlive Off
-
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
   RewriteRule ^/(.*)$ %%redirect%%/$1 [R=301,L]
-
 </Virtualhost>
 <VirtualHost *:443>
   ServerName %%fqdn%%
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   SSLEngine On
   SSLCertificateFile %%CRT%%
   SSLCertificateKeyFile %%KEY%%
   %%CHAINLINE%%
-
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteRule ^/(.*)$ %%redirect%%/$1 [R=301,L]
-
 </VirtualHost>

etc/alternc/templates/apache2/vhost-both.conf

@@ -1,9 +1,9 @@
+# %%fqdn%%
 <VirtualHost *:80>
   ServerName %%fqdn%%
   DocumentRoot "%%document_root%%"
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   <Directory "%%document_root%%">
     php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
     php_admin_value upload_tmp_dir %%account_root%%/tmp
@@ -12,15 +12,12 @@
     Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
     AllowOverride AuthConfig FileInfo Limit Options Indexes
   </Directory>
-
 </VirtualHost>
-
 <VirtualHost *:443>
   ServerName %%fqdn%%
   DocumentRoot "%%document_root%%"
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   <Directory "%%document_root%%">
     php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
     php_admin_value upload_tmp_dir %%account_root%%/tmp
@@ -29,11 +26,8 @@
     Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
     AllowOverride AuthConfig FileInfo Limit Options Indexes
   </Directory>
-
   SSLEngine On
   SSLCertificateFile %%CRT%%
   SSLCertificateKeyFile %%KEY%%
   %%CHAINLINE%%
-
 </VirtualHost>
-

etc/alternc/templates/apache2/vhost-http.conf

@@ -1,28 +1,23 @@
+# %%fqdn%%
 <Virtualhost *:443>
   ServerName %%fqdn%%
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   KeepAlive Off
-
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
   RewriteRule ^/(.*)$ http://%%fqdn%%/$1 [R=301,L]
-
   SSLEngine On
   SSLCertificateFile %%CRT%%
   SSLCertificateKeyFile %%KEY%%
   %%CHAINLINE%%
-
 </Virtualhost>
-
 <VirtualHost *:80>
   ServerName %%fqdn%%
   DocumentRoot "%%document_root%%"
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   <Directory "%%document_root%%">
     php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
     php_admin_value upload_tmp_dir %%account_root%%/tmp
@@ -32,11 +27,7 @@
     AllowOverride AuthConfig FileInfo Limit Options Indexes
     Require all granted
   </Directory>
-
-# If you want to log the errors also in /var/log/alternc/sites/
 # WARNING: this WILL FORK a vlogger for EACH VHOST havingg this !!! the load on the machine may be high
 # on hosting with many vhosts. as a consequence, this is disabled by default
 #  ErrorLog "|| /usr/sbin/vlogger -e -u alterncpanel -g alterncpanel -s error.log -t \"error-%Y%m%d.log\" /var/log/alternc/sites/%%UID%%-%%LOGIN%%/"
-
 </VirtualHost>
-

etc/alternc/templates/apache2/vhost-https.conf

@@ -1,22 +1,19 @@
+# %%fqdn%%
 <Virtualhost *:80>
   ServerName %%fqdn%%
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   KeepAlive Off
-
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
   RewriteRule ^/(.*)$ https://%%fqdn%%/$1 [R=301,L]
-
 </Virtualhost>
 <VirtualHost *:443>
   ServerName %%fqdn%%
   DocumentRoot "%%document_root%%"
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
   <Directory "%%document_root%%">
     php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
     php_admin_value upload_tmp_dir %%account_root%%/tmp
@@ -25,11 +22,8 @@
     Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
     AllowOverride AuthConfig FileInfo Limit Options Indexes
   </Directory>
-
   SSLEngine On
   SSLCertificateFile %%CRT%%
   SSLCertificateKeyFile %%KEY%%
   %%CHAINLINE%%
-
 </VirtualHost>
-