kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Sébastien Grenier 2018-07-12 22:56:42 -03:00
parent 354b7f0709 7954ab8835
commit 3b58499873
5 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/alternc/templates/apache2/panel.conf
View File

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

7
etc/alternc/templates/apache2/url.conf
View File

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

8
etc/alternc/templates/apache2/vhost-both.conf
View File

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

11
etc/alternc/templates/apache2/vhost-http.conf
View File

@ -1,28 +1,23 @@
# %%fqdn%%
<Virtualhost *:443> <Virtualhost *:443>
ServerName %%fqdn%% ServerName %%fqdn%%
AssignUserId #%%UID%% #%%GID%% AssignUserId #%%UID%% #%%GID%%
SetEnv LOGIN "%%UID%%-%%LOGIN%%" SetEnv LOGIN "%%UID%%-%%LOGIN%%"
KeepAlive Off KeepAlive Off
RewriteEngine On RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !/cgi-bin/ RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/ RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
RewriteRule ^/(.*)$ http://%%fqdn%%/$1 [R=301,L] RewriteRule ^/(.*)$ http://%%fqdn%%/$1 [R=301,L]
SSLEngine On SSLEngine On
SSLCertificateFile %%CRT%% SSLCertificateFile %%CRT%%
SSLCertificateKeyFile %%KEY%% SSLCertificateKeyFile %%KEY%%
%%CHAINLINE%% %%CHAINLINE%%
</Virtualhost> </Virtualhost>
<VirtualHost *:80> <VirtualHost *:80>
ServerName %%fqdn%% ServerName %%fqdn%%
DocumentRoot "%%document_root%%" DocumentRoot "%%document_root%%"
AssignUserId #%%UID%% #%%GID%% AssignUserId #%%UID%% #%%GID%%
SetEnv LOGIN "%%UID%%-%%LOGIN%%" SetEnv LOGIN "%%UID%%-%%LOGIN%%"
<Directory "%%document_root%%"> <Directory "%%document_root%%">
php_admin_value open_basedir "%%account_root%%:/usr/share/php/" php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
php_admin_value upload_tmp_dir %%account_root%%/tmp php_admin_value upload_tmp_dir %%account_root%%/tmp
@ -32,11 +27,7 @@
AllowOverride AuthConfig FileInfo Limit Options Indexes AllowOverride AuthConfig FileInfo Limit Options Indexes
Require all granted Require all granted
</Directory> </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 # 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 # 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%%/" # 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> </VirtualHost>

8
etc/alternc/templates/apache2/vhost-https.conf
View File

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