diff --git a/conf/ios-profile.xml b/conf/ios-profile.xml
deleted file mode 100644
index 983b260d..00000000
--- a/conf/ios-profile.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-
- PayloadContent
-
-
- CalDAVAccountDescription
- PRIMARY_HOSTNAME calendar
- CalDAVHostName
- PRIMARY_HOSTNAME
- CalDAVPort
- 443
- CalDAVPrincipalURL
- /cloud/remote.php/caldav/calendars/
- CalDAVUseSSL
-
- PayloadDescription
- PRIMARY_HOSTNAME (Mail-in-a-Box)
- PayloadDisplayName
- PRIMARY_HOSTNAME calendar
- PayloadIdentifier
- email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.CalDAV
- PayloadOrganization
-
- PayloadType
- com.apple.caldav.account
- PayloadUUID
- UUID1
- PayloadVersion
- 1
-
-
- EmailAccountDescription
- PRIMARY_HOSTNAME mail
- EmailAccountType
- EmailTypeIMAP
- IncomingMailServerAuthentication
- EmailAuthPassword
- IncomingMailServerHostName
- PRIMARY_HOSTNAME
- IncomingMailServerPortNumber
- 993
- IncomingMailServerUseSSL
-
- OutgoingMailServerAuthentication
- EmailAuthPassword
- OutgoingMailServerHostName
- PRIMARY_HOSTNAME
- OutgoingMailServerPortNumber
- 587
- OutgoingMailServerUseSSL
-
- OutgoingPasswordSameAsIncomingPassword
-
- PayloadDescription
- PRIMARY_HOSTNAME (Mail-in-a-Box)
- PayloadDisplayName
- PRIMARY_HOSTNAME mail
- PayloadIdentifier
- email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.E-Mail
- PayloadOrganization
-
- PayloadType
- com.apple.mail.managed
- PayloadUUID
- UUID2
- PayloadVersion
- 1
- PreventAppSheet
-
- PreventMove
-
- SMIMEEnabled
-
-
-
- CardDAVAccountDescription
- PRIMARY_HOSTNAME contacts
- CardDAVHostName
- PRIMARY_HOSTNAME
- CardDAVPort
- 443
- CardDAVPrincipalURL
- /cloud/remote.php/carddav/addressbooks/
- CardDAVUseSSL
-
- PayloadDescription
- PRIMARY_HOSTNAME (Mail-in-a-Box)
- PayloadDisplayName
- PRIMARY_HOSTNAME contacts
- PayloadIdentifier
- email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.carddav
- PayloadOrganization
-
- PayloadType
- com.apple.carddav.account
- PayloadUUID
- UUID3
- PayloadVersion
- 1
-
-
- PayloadDescription
- PRIMARY_HOSTNAME (Mail-in-a-Box)
- PayloadDisplayName
- PRIMARY_HOSTNAME
- PayloadIdentifier
- email.mailinabox.mobileconfig.PRIMARY_HOSTNAME
- PayloadOrganization
-
- PayloadRemovalDisallowed
-
- PayloadType
- Configuration
- PayloadUUID
- UUID4
- PayloadVersion
- 1
-
-
diff --git a/conf/mozilla-autoconfig.xml b/conf/mozilla-autoconfig.xml
deleted file mode 100644
index 03e2fef3..00000000
--- a/conf/mozilla-autoconfig.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- PRIMARY_HOSTNAME
-
- PRIMARY_HOSTNAME (Mail-in-a-Box)
- PRIMARY_HOSTNAME
-
-
- PRIMARY_HOSTNAME
- 993
- SSL
- %EMAILADDRESS%
- password-cleartext
-
-
-
- PRIMARY_HOSTNAME
- 587
- STARTTLS
- %EMAILADDRESS%
- password-cleartext
- true
- true
-
-
-
- PRIMARY_HOSTNAME website.
-
-
-
-
-
-
- %EMAILADDRESS%
-
-
-
-
-
-
-
-
-
diff --git a/conf/nginx-alldomains.conf b/conf/nginx-alldomains.conf
index 995745e4..df8ec46b 100644
--- a/conf/nginx-alldomains.conf
+++ b/conf/nginx-alldomains.conf
@@ -12,13 +12,6 @@
access_log off;
}
- location = /mailinabox.mobileconfig {
- alias /var/lib/mailinabox/mobileconfig.xml;
- }
- location = /.well-known/autoconfig/mail/config-v1.1.xml {
- alias /var/lib/mailinabox/mozilla-autoconfig.xml;
- }
-
# Roundcube Webmail configuration.
rewrite ^/mail$ /mail/ redirect;
rewrite ^/mail/$ /mail/index.php;
@@ -43,26 +36,6 @@
client_max_body_size 128M;
}
- # Z-Push (Microsoft Exchange ActiveSync)
- location /Microsoft-Server-ActiveSync {
- include /etc/nginx/fastcgi_params;
- fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/index.php;
- fastcgi_param PHP_VALUE "include_path=.:/usr/share/php:/usr/share/pear:/usr/share/awl/inc";
- fastcgi_read_timeout 630;
- fastcgi_pass php-fpm;
-
- # Outgoing mail also goes through this endpoint, so increase the maximum
- # file upload limit to match the corresponding Postfix limit.
- client_max_body_size 128M;
- }
- location ~* ^/autodiscover/autodiscover.xml$ {
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/autodiscover/autodiscover.php;
- fastcgi_param PHP_VALUE "include_path=.:/usr/share/php:/usr/share/pear:/usr/share/awl/inc";
- fastcgi_pass php-fpm;
- }
-
-
# ADDITIONAL DIRECTIVES HERE
# Disable viewing dotfiles (.htaccess, .svn, .git, etc.)
diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index 55c80eba..17d0b089 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -10,57 +10,4 @@
add_header X-Content-Type-Options nosniff;
add_header Content-Security-Policy "frame-ancestors 'none';";
}
-
- # ownCloud configuration.
- rewrite ^/cloud$ /cloud/ redirect;
- rewrite ^/cloud/$ /cloud/index.php;
- rewrite ^/cloud/(contacts|calendar|files)$ /cloud/index.php/apps/$1/ redirect;
- rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
- location /cloud/ {
- alias /usr/local/lib/owncloud/;
- location ~ ^/cloud/(build|tests|config|lib|3rdparty|templates|data|README)/ {
- deny all;
- }
- location ~ ^/cloud/(?:\.|autotest|occ|issue|indie|db_|console) {
- deny all;
- }
- }
- location ~ ^(/cloud)((?:/ocs)?/[^/]+\.php)(/.*)?$ {
- # note: ~ has precendence over a regular location block
- # Accept URLs like:
- # /cloud/index.php/apps/files/
- # /cloud/index.php/apps/files/ajax/scan.php (it's really index.php; see 6fdef379adfdeac86cc2220209bdf4eb9562268d)
- # /cloud/ocs/v1.php/apps/files_sharing/api/v1 (see #240)
- # /cloud/remote.php/webdav/yourfilehere...
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2;
- fastcgi_param SCRIPT_NAME $1$2;
- fastcgi_param PATH_INFO $3;
- fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
- fastcgi_param MOD_X_ACCEL_REDIRECT_PREFIX /owncloud-xaccel;
- fastcgi_read_timeout 630;
- fastcgi_pass php-fpm;
- error_page 403 /cloud/core/templates/403.php;
- error_page 404 /cloud/core/templates/404.php;
- client_max_body_size 1G;
- fastcgi_buffers 64 4K;
- }
- location ^~ /owncloud-xaccel/ {
- # This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. ownCloud sends the full file
- # path on disk as a subdirectory under this virtual path.
- # We must only allow 'internal' redirects within nginx so that the filesystem
- # is not exposed to the world.
- internal;
- alias /;
- }
- location ~ ^/((caldav|carddav|webdav).*)$ {
- # Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
- # Properly proxying like this seems to work fine.
- proxy_pass https://127.0.0.1/cloud/remote.php/$1;
- }
- rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
- rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
- rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;
- rewrite ^/.well-known/caldav /cloud/remote.php/caldav/ redirect;
-
# ADDITIONAL DIRECTIVES HERE
diff --git a/conf/zpush/autodiscover_config.php b/conf/zpush/autodiscover_config.php
deleted file mode 100644
index df6faa1e..00000000
--- a/conf/zpush/autodiscover_config.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
diff --git a/conf/zpush/backend_caldav.php b/conf/zpush/backend_caldav.php
deleted file mode 100644
index b10ebc3e..00000000
--- a/conf/zpush/backend_caldav.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/conf/zpush/backend_carddav.php b/conf/zpush/backend_carddav.php
deleted file mode 100644
index 4b166ad5..00000000
--- a/conf/zpush/backend_carddav.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/conf/zpush/backend_combined.php b/conf/zpush/backend_combined.php
deleted file mode 100644
index 9d5aea24..00000000
--- a/conf/zpush/backend_combined.php
+++ /dev/null
@@ -1,49 +0,0 @@
- array(
- 'i' => array(
- 'name' => 'BackendIMAP',
- ),
- 'c' => array(
- 'name' => 'BackendCalDAV',
- ),
- 'd' => array(
- 'name' => 'BackendCardDAV',
- ),
- ),
- 'delimiter' => '/',
- 'folderbackend' => array(
- SYNC_FOLDER_TYPE_INBOX => 'i',
- SYNC_FOLDER_TYPE_DRAFTS => 'i',
- SYNC_FOLDER_TYPE_WASTEBASKET => 'i',
- SYNC_FOLDER_TYPE_SENTMAIL => 'i',
- SYNC_FOLDER_TYPE_OUTBOX => 'i',
- SYNC_FOLDER_TYPE_TASK => 'c',
- SYNC_FOLDER_TYPE_APPOINTMENT => 'c',
- SYNC_FOLDER_TYPE_CONTACT => 'd',
- SYNC_FOLDER_TYPE_NOTE => 'c',
- SYNC_FOLDER_TYPE_JOURNAL => 'c',
- SYNC_FOLDER_TYPE_OTHER => 'i',
- SYNC_FOLDER_TYPE_USER_MAIL => 'i',
- SYNC_FOLDER_TYPE_USER_APPOINTMENT => 'c',
- SYNC_FOLDER_TYPE_USER_CONTACT => 'd',
- SYNC_FOLDER_TYPE_USER_TASK => 'c',
- SYNC_FOLDER_TYPE_USER_JOURNAL => 'c',
- SYNC_FOLDER_TYPE_USER_NOTE => 'c',
- SYNC_FOLDER_TYPE_UNKNOWN => 'i',
- ),
- 'rootcreatefolderbackend' => 'i',
- );
- }
-}
-
-?>
diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php
deleted file mode 100644
index 84dc7358..00000000
--- a/conf/zpush/backend_imap.php
+++ /dev/null
@@ -1,51 +0,0 @@
- true)));
-define('IMAP_FROM_SQL_QUERY', "select first_name, last_name, mail_address from users where mail_address = '#username@#domain'");
-define('IMAP_FROM_SQL_FIELDS', serialize(array('first_name', 'last_name', 'mail_address')));
-define('IMAP_FROM_SQL_FROM', '#first_name #last_name <#mail_address>');
-define('IMAP_FROM_LDAP_SERVER', '');
-define('IMAP_FROM_LDAP_SERVER_PORT', '389');
-define('IMAP_FROM_LDAP_USER', 'cn=zpush,ou=servers,dc=zpush,dc=org');
-define('IMAP_FROM_LDAP_PASSWORD', 'password');
-define('IMAP_FROM_LDAP_BASE', 'dc=zpush,dc=org');
-define('IMAP_FROM_LDAP_QUERY', '(mail=#username@#domain)');
-define('IMAP_FROM_LDAP_FIELDS', serialize(array('givenname', 'sn', 'mail')));
-define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>');
-
-define('IMAP_SMTP_METHOD', 'sendmail');
-
-global $imap_smtp_params;
-$imap_smtp_params = array('host' => 'ssl://127.0.0.1', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
-
-define('MAIL_MIMEPART_CRLF', "\r\n");
-
-?>