- added ActiveSync directory to all packages
authorLars Kneschke <l.kneschke@metaways.de>
Sun, 5 Feb 2012 09:39:51 +0000 (10:39 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sun, 5 Feb 2012 10:42:36 +0000 (11:42 +0100)
- create tine20-activesync package
- made rewrite rules working at all

Change-Id: I7563dfd03ecd181cf4536a754ba148c607b68739
Reviewed-on: https://gerrit.tine20.org/tine20/113
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: jenkins user
scripts/packaging/build-tine20-packages.sh
scripts/packaging/debian/control
scripts/packaging/debian/etc/apache.conf
scripts/packaging/debian/tine20-activesync.install [new file with mode: 0644]

index b094ede..643fdcf 100755 (executable)
@@ -245,7 +245,7 @@ function createSpecialArchives()
     rm -rf $TEMPDIR/allinone
     mkdir $TEMPDIR/allinone
     
-    for ARCHIVENAME in calendar tinebase crm felamimail filemanager projects sales tasks timetracker; do
+    for ARCHIVENAME in activesync calendar tinebase crm felamimail filemanager projects sales tasks timetracker; do
         (cd $TEMPDIR/allinone; tar xjf ../../packages/tine20/$RELEASE/tine20-${ARCHIVENAME}_$RELEASE.tar.bz2)
     done
     
index af116c9..da0045e 100644 (file)
@@ -24,7 +24,6 @@ Architecture: all
 Depends: ${misc:Depends}, 
     httpd, 
     libapache2-mod-php5 | php5 | php5-cgi | php5-fpm, 
-    mysql-client, 
     dbconfig-common, 
     wwwconfig-common, 
     php5-mysql | php5-mysqli, 
@@ -40,6 +39,13 @@ Description: webbased groupware and crm - core + addressbook module
  Installing this package enables you to manage user accounts and contacts. Also
  provides integration with openstreet map.
 
+Package: tine20-activesync
+Architecture: all
+Depends: tine20-tinebase (= ${binary:Version})
+Description: webbased groupware and crm - activesync module
+ This package contains the activesync module of Tine 2.0. Installing this package
+ enables you to syncronize contacts, event, tasks and emails with your mobile phone.
+
 Package: tine20-calendar
 Architecture: all
 Depends: tine20-tinebase (= ${binary:Version})
index 28b5d4e..d3fa9d6 100644 (file)
@@ -1,9 +1,11 @@
 # Apache and PHP configuration for Tine 2.0
 #
 
-Alias /tine20/ /usr/share/tine20/
+Alias /tine20 /usr/share/tine20
+Alias /Microsoft-Server-ActiveSync /usr/share/tine20/Microsoft-Server-ActiveSync
 
 # some people prefer a simple URL like http://tine20.example.org
+# in this case you also have to disable to Alias lines above
 #<VirtualHost 1.2.3.4:80>
 #  DocumentRoot /usr/share/tine20
 #  ServerName tine20.example.org
@@ -47,20 +49,22 @@ Alias /tine20/ /usr/share/tine20/
     <IfModule mod_rewrite.c>
         RewriteEngine on
 
+        RewriteBase /tine20
+
         # ActiveSync
-        RewriteRule ^/Microsoft-Server-ActiveSync /index.php?frontend=activesync         [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^Microsoft-Server-ActiveSync index.php?frontend=activesync         [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
         
         # OpenID
-        RewriteRule ^/users/(.*)                  /index.php?frontend=openid&username=$1 [L,QSA]
+        RewriteRule ^users/(.*)                  index.php?frontend=openid&username=$1 [L,QSA]
 
         # WebDAV / CalDAV / CardDAV
         RewriteCond %{REQUEST_METHOD} !^(GET|POST)$
-        RewriteRule ^/$                           /index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^$                           index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
-        RewriteRule ^/addressbooks                /index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-        RewriteRule ^/calendars                   /index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-        RewriteRule ^/webdav                      /index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-        RewriteRule ^/principals                  /index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^addressbooks                index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^calendars                   index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^webdav                      index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+        RewriteRule ^principals                  index.php?frontend=webdav             [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
         
     </IfModule>
 
diff --git a/scripts/packaging/debian/tine20-activesync.install b/scripts/packaging/debian/tine20-activesync.install
new file mode 100644 (file)
index 0000000..66fd2f2
--- /dev/null
@@ -0,0 +1 @@
+ActiveSync     /usr/share/tine20