Merge branch 'master' of https://git.tine20.org/git/tine20
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 13:53:49 +0000 (15:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 13:53:49 +0000 (15:53 +0200)
scripts/packaging/debian/control
scripts/packaging/debian/etc/apache.conf

index 6b37391..01942ab 100644 (file)
@@ -15,9 +15,9 @@ Description: webbased groupware and crm - metapackage
 
 Package: tine20-tinebase
 Architecture: all
-Depends: ${misc:Depends}, httpd, php5 | php5-cgi | libapache2-mod-php5, mysql-client, dbconfig-common, wwwconfig-common, php5-mysql
-Recommends: mysql-client
-Description: webbased groupware and crm - calendar module
+Depends: ${misc:Depends}, httpd, php5 | php5-cgi | php5-mcrypt | php5-gd | php5-mysql | php5- libapache2-mod-php5, mysql-client, dbconfig-common, wwwconfig-common, php5-mysql
+Recommends: mysql-client | php5-ldap
+Description: webbased groupware and crm - core + addressbook module
  Tine 2.0 calendar module
 
 Package: tine20-calendar
index 78bbb4f..491136e 100644 (file)
@@ -20,7 +20,24 @@ Alias /tine20/ /usr/share/tine20/
     #    Options +ExecCGI
     #    FcgidWrapper /usr/local/bin/php-wrapper .php 
     #</IfModule>
-
+    
+    <IfModule mod_php5.c>
+        php_admin_value max_input_time 120
+        php_admin_value include_path .:/usr/share/tine20:/usr/share/tine20/library:/etc/tine20
+        php_admin_value open_basedir .:/usr/share/tine20:/var/lib/tine20:/tmp:/usr/share/php:/etc/tine20
+        php_admin_value session.gc_maxlifetime 86400
+        php_admin_value max_execution_time 90
+        php_admin_value memory_limit 64M
+        php_admin_value upload_max_filesize 20M
+        php_admin_value post_max_size 20M
+        php_admin_value safe_mode off
+        php_admin_flag display_errors off
+        php_admin_flag log_errors on
+        php_admin_flag magic_quotes_gpc off
+        php_admin_flag magic_quotes_runtime off
+        php_admin_flag register_globals off
+    </IfModule>
+    
     <IfModule mod_rewrite.c>
         RewriteEngine on