From fd5e46754d55cd4c90f24d7970933f2d28eddeef Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:34:09 -0700 Subject: [PATCH 01/10] Delete autodiscover_config.php --- conf/zpush/autodiscover_config.php | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 conf/zpush/autodiscover_config.php 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 @@ - From 5d39cde2ec4d7064faf37a089e377c46c8437b8a Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:35:24 -0700 Subject: [PATCH 02/10] Delete backend_caldav.php --- conf/zpush/backend_caldav.php | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 conf/zpush/backend_caldav.php 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 @@ - From c5e54d9c09980fa08fe95d4fbf18e0486ba07f28 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:35:29 -0700 Subject: [PATCH 03/10] Delete backend_carddav.php --- conf/zpush/backend_carddav.php | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 conf/zpush/backend_carddav.php 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 @@ - From 9df39a7c74fba552e38ffe76fd27dc6a157c67b7 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:35:35 -0700 Subject: [PATCH 04/10] Delete backend_combined.php --- conf/zpush/backend_combined.php | 49 --------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 conf/zpush/backend_combined.php 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', - ); - } -} - -?> From b27e5eae2428aac088b8e88c88dfe7a611f706fd Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:35:40 -0700 Subject: [PATCH 05/10] Delete backend_imap.php --- conf/zpush/backend_imap.php | 51 ------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 conf/zpush/backend_imap.php 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"); - -?> From d3be238d48462921df9412022f9ba61dc414c437 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:38:39 -0700 Subject: [PATCH 06/10] Update ios-profile.xml --- conf/ios-profile.xml | 58 +++----------------------------------------- 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/conf/ios-profile.xml b/conf/ios-profile.xml index 983b260d..addf13dd 100644 --- a/conf/ios-profile.xml +++ b/conf/ios-profile.xml @@ -11,32 +11,6 @@ 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 @@ -61,11 +35,11 @@ OutgoingPasswordSameAsIncomingPassword PayloadDescription - PRIMARY_HOSTNAME (Mail-in-a-Box) + PRIMARY_HOSTNAME PayloadDisplayName PRIMARY_HOSTNAME mail PayloadIdentifier - email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.E-Mail + email.mobileconfig.PRIMARY_HOSTNAME.E-Mail PayloadOrganization PayloadType @@ -81,39 +55,13 @@ 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 + email.mobileconfig.PRIMARY_HOSTNAME PayloadOrganization PayloadRemovalDisallowed From 10d0c64b3044ad468b87043435a1a7e8aeec20cd Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:38:53 -0700 Subject: [PATCH 07/10] Delete mozilla-autoconfig.xml --- conf/mozilla-autoconfig.xml | 44 ------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 conf/mozilla-autoconfig.xml 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% - - - - - - - - - From 15387d1701f4df579e914f7cd32cdfbc3f3dcade Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:38:58 -0700 Subject: [PATCH 08/10] Delete ios-profile.xml --- conf/ios-profile.xml | 76 -------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 conf/ios-profile.xml diff --git a/conf/ios-profile.xml b/conf/ios-profile.xml deleted file mode 100644 index addf13dd..00000000 --- a/conf/ios-profile.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - PayloadContent - - - 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 - PayloadDisplayName - PRIMARY_HOSTNAME mail - PayloadIdentifier - email.mobileconfig.PRIMARY_HOSTNAME.E-Mail - PayloadOrganization - - PayloadType - com.apple.mail.managed - PayloadUUID - UUID2 - PayloadVersion - 1 - PreventAppSheet - - PreventMove - - SMIMEEnabled - - - - PayloadDescription - PRIMARY_HOSTNAME (Mail-in-a-Box) - PayloadDisplayName - PRIMARY_HOSTNAME - PayloadIdentifier - email.mobileconfig.PRIMARY_HOSTNAME - PayloadOrganization - - PayloadRemovalDisallowed - - PayloadType - Configuration - PayloadUUID - UUID4 - PayloadVersion - 1 - - From ab4b0e5546b4363b1947792770d3c51aa18b2314 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:39:59 -0700 Subject: [PATCH 09/10] Update nginx-primaryonly.conf --- conf/nginx-primaryonly.conf | 53 ------------------------------------- 1 file changed, 53 deletions(-) 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 From 2b48860049b58936e2950cb4e8befe6531b3fffe Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:41:35 -0700 Subject: [PATCH 10/10] Update nginx-alldomains.conf --- conf/nginx-alldomains.conf | 27 --------------------------- 1 file changed, 27 deletions(-) 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.)