[enh] adding update_domains.php in cron, fixing panel to NOT include autodiscover from now
This commit is contained in:
Benjamin Sonntag
parent
9b7332f354
commit
f898407d3d
|
|
@ -41,3 +41,4 @@ bureau/locales/fr_FR/LC_MESSAGES/messages.po~
|
|||
bureau/locales/it_IT/LC_MESSAGES/messages.po~
|
||||
bureau/locales/nl_NL/LC_MESSAGES/messages.po~
|
||||
bureau/locales/pt_BR/LC_MESSAGES/messages.po~
|
||||
.tx/alternc.alternc
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
|||
0 5 * * * alterncpanel /usr/lib/alternc/sqlbackup.sh -t daily
|
||||
0 4 * * 0 alterncpanel /usr/lib/alternc/sqlbackup.sh -t weekly
|
||||
|
||||
# Every 5 minutes, spool waiting domain changes
|
||||
*/5 * * * * root /usr/lib/alternc/update_domains.sh
|
||||
# Every minute, spool waiting domain changes
|
||||
* * * * * root /usr/lib/alternc/update_domains.php
|
||||
|
||||
# Every 5 minutes, do mails actions
|
||||
*/5 * * * * root /usr/lib/alternc/update_mails.sh
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@
|
|||
DocumentRoot /usr/share/alternc/panel/admin
|
||||
ServerName %%fqdn%%
|
||||
|
||||
# Mail autoconfig
|
||||
ServerAlias autoconfig.*
|
||||
ServerAlias autodiscover.*
|
||||
|
||||
RewriteEngine on
|
||||
RewriteRule ^/admin/(.*) /$1 [R=301,L]
|
||||
|
||||
|
|
@ -17,20 +13,6 @@
|
|||
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]
|
||||
RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
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/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]
|
||||
|
||||
|
||||
# will be used to define aliases such as /javascript /webmail /squirrelmail ...
|
||||
IncludeOptional /etc/alternc/apache-panel.d/*.conf
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
|
||||
<VirtualHost *:80>
|
||||
DocumentRoot /usr/share/alternc/panel/admin
|
||||
|
||||
AssignUserId alterncpanel alterncpanel
|
||||
SetEnv LOGIN "0000-panel"
|
||||
|
||||
ServerName %%fqdn%%
|
||||
|
||||
# Mail autoconfig
|
||||
RewriteRule ^/mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^/mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
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/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]
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
<VirtualHost *:443>
|
||||
DocumentRoot /usr/share/alternc/panel/admin
|
||||
|
||||
AssignUserId alterncpanel alterncpanel
|
||||
SetEnv LOGIN "0000-panel"
|
||||
|
||||
ServerName %%fqdn%%
|
||||
|
||||
# Mail autoconfig
|
||||
RewriteRule ^/mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^/mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
|
||||
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/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]
|
||||
|
||||
SSLEngine On
|
||||
SSLCertificateFile %%CRT%%
|
||||
SSLCertificateKeyFile %%KEY%%
|
||||
%%CHAINLINE%%
|
||||
|
||||
</VirtualHost>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
#!/usr/bin/php -q
|
||||
<?php
|
||||
|
||||
// bootstrap
|
||||
require_once("/usr/share/alternc/panel/class/config_nochk.php");
|
||||
|
||||
putenv("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
|
||||
|
||||
$dom->update_domains();
|
||||
|
||||
Loading…
Reference in New Issue