# HG changeset patch
# User Heiko Schlittermann (JUMPER) <hs@schlittermann.de>
# Date 1329690872 -3600
# Node ID aa280f39150b447dc7ce03f70a20185d9c305faf
# Parent  e489aabf88e4aa87f4c3e509290d69c83d711783
New Version 2012013000
* littlebird-tc-sql is now only a suggestion, not a recommendation
  anymore!
* proved a /var/lib/trustcenter-tc/sessions dir and link
  it to /usr/share/trustcenter-tc/data/sessions
* guessing more zend extensions (php-5.3-bin-zend…)
* added dependency on php5-cli
* fixed apache restart
* addes missing CA (using a snakeoil ca)
* added missing application_installation.ini (got from Stefan Koegel)
* same game for fixing the time zone
* link to /usr/local/zend/… only if these files exist
* fixed missing logs (no attempt to chmod it anymore)
* fixed dependency on zend-base
* new upstream
* removed dependency on zend server

diff -r e489aabf88e4 -r aa280f39150b .hgignore
--- a/.hgignore	Fri Oct 14 14:44:08 2011 +0200
+++ b/.hgignore	Sun Feb 19 23:34:32 2012 +0100
@@ -28,3 +28,4 @@
 debian/littlebird-tc-sql.postrm.debhelper
 debian/littlebird-tc-sql.substvars
 debian/littlebird-tc-core.postrm.debhelper
+debian/littlebird-tc/DEBIAN/prerm
diff -r e489aabf88e4 -r aa280f39150b debian/README.Debian
--- a/debian/README.Debian	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/README.Debian	Sun Feb 19 23:34:32 2012 +0100
@@ -20,6 +20,11 @@
 deb http://repos.zend.com/zend-server/deb server non-free
 ::::8<-----
 
+You need to get the keys of the above repositories:
+
+    wget http://repos.zend.com/zend.key -O- | apt-key add -
+    wget https://ssl.schlittermann.de/apt.key -O- | apt-key add -
+
 Then update the package information:
 
     # aptitude update
diff -r e489aabf88e4 -r aa280f39150b debian/README.source
--- a/debian/README.source	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/README.source	Sun Feb 19 23:34:32 2012 +0100
@@ -4,15 +4,32 @@
 1. obtain the source littlebird*.tar.gz from 
    scp://schlittermann@92.51.155.210/*.tar.gz
 
-2. rename the archive to littlebird_YYYYMMDDNN.orig.tar.gz
+   May be debian/fetch-source can help you.
+
+2. Rename the archive to littlebird_YYYYMMDDNN.orig.tar.gz
    (NN is some per day increment)
 
+2a. Take care, that this littlebird_*.orig.tar.gz is 
+   above the source dir.
+
 3. go into the source dir (the dir containing debian/)
    mkdir tmp
    cd tmp && tar xzf ../../littlebird_YYYYMMDDNN.orig.tar.gz
-   mv LittleBird-Test/* ..
+   mv LittleBird-YYYYmmddNN/* ..
    cd ..
    rm -r tmp
 
+The layout should be about like this:
+    
+    littlebird_YYYYmmddNN.orig.tar.gz
+    littlebird/
+               debian
+	       3rdparty
+	       libray
+	       TrustCenter
+	       CA
+	       RestInterface
+	       …
+
 4. continue as usual
 
diff -r e489aabf88e4 -r aa280f39150b debian/changelog
--- a/debian/changelog	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/changelog	Sun Feb 19 23:34:32 2012 +0100
@@ -1,3 +1,23 @@
+littlebird (2012013100-0) stable; urgency=low
+
+  * littlebird-tc-sql is now only a suggestion, not a recommendation
+    anymore!
+  * proved a /var/lib/trustcenter-tc/sessions dir and link
+    it to /usr/share/trustcenter-tc/data/sessions
+  * guessing more zend extensions (php-5.3-bin-zend…) 
+  * added dependency on php5-cli 
+  * fixed apache restart 
+  * addes missing CA (using a snakeoil ca) 
+  * added missing application_installation.ini (got from Stefan Koegel) 
+  * same game for fixing the time zone 
+  * link to /usr/local/zend/… only if these files exist 
+  * fixed missing logs (no attempt to chmod it anymore)
+  * fixed dependency on zend-base
+  * new upstream
+  * removed dependency on zend server
+
+ -- Heiko Schlittermann <hs@schlittermann.de>  Sun, 19 Feb 2012 23:33:08 +0100
+
 littlebird (2011092200-2.1) stable; urgency=low
 
   * Non-maintainer upload.
diff -r e489aabf88e4 -r aa280f39150b debian/control
--- a/debian/control	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/control	Sun Feb 19 23:34:32 2012 +0100
@@ -7,6 +7,14 @@
 Homepage: http://little-bird.de/
 Vcs-Browser: https://ssl.schlittermann.de/hg/littlebird/packaging/deb
 
+Package: littlebird-tc
+Architecture: all
+Depends: ${misc:Depends},
+    littlebird-tc-core (>= ${source:Version}), 
+    littlebird-tc-sql (>= ${source:Version})
+Description: This is the all-on-one solution.
+ This package installs the complete littlebird trustcenter.
+
 Package: littlebird-tc-common
 Architecture: all
 Depends: ${misc:Depends}
@@ -18,9 +26,10 @@
 Architecture: all
 Depends: ${misc:Depends},
 	littlebird-tc-common (>= ${source:Version}), 
-	zend-server-php-5.3, php-5.3-loader-zend-server, openssl, ucf, 
-	pdftk, mail-transport-agent, httpd
-Recommends: littlebird-tc-sql (>= ${source:Version})
+	pdftk, mail-transport-agent, httpd, openssl, ucf, 
+	zend-base, php-5.3-bin-zend-server, php-5.3-loader-zend-server,
+	libapache2-mod-php-5.3-zend-server
+Suggests: littlebird-tc-sql (>= ${source:Version})
 Provides: littlebird-tc
 Description: littlebird trustcenter core
  This is the trustcenter package for littlebird.
diff -r e489aabf88e4 -r aa280f39150b debian/examples/apache/littlebird-tc.conf
--- a/debian/examples/apache/littlebird-tc.conf	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/examples/apache/littlebird-tc.conf	Sun Feb 19 23:34:32 2012 +0100
@@ -26,12 +26,14 @@
 
         DocumentRoot /usr/share/littlebird-tc/TrustCenter/public
         <Directory /usr/share/littlebird-tc/TrustCenter/public>
+	<IfModule mod_rewrite.c>
             RewriteEngine On
             RewriteCond %{REQUEST_FILENAME} -s [OR]
             RewriteCond %{REQUEST_FILENAME} -l [OR]
             RewriteCond %{REQUEST_FILENAME} -d
             RewriteRule ^.*$ - [NC,L]
             RewriteRule ^.*$ index.php [NC,L]
+	</IfModule>
             AllowOverride All
             Order allow,deny
             allow from all
diff -r e489aabf88e4 -r aa280f39150b debian/littlebird-tc-core.dirs
--- a/debian/littlebird-tc-core.dirs	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/littlebird-tc-core.dirs	Sun Feb 19 23:34:32 2012 +0100
@@ -1,2 +1,3 @@
 /var/log
 /var/lib/littlebird-tc
+/var/lib/littlebird-tc/sessions
diff -r e489aabf88e4 -r aa280f39150b debian/littlebird-tc-core.links
--- a/debian/littlebird-tc-core.links	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/littlebird-tc-core.links	Sun Feb 19 23:34:32 2012 +0100
@@ -1,2 +1,3 @@
 /var/log/littlebird-tc /usr/share/littlebird-tc/TrustCenter/data/logs
 /var/lib/littlebird-tc/CA /usr/share/littlebird-tc/CA
+/var/lib/littlebird-tc/sessions /usr/share/littlebird-tc/data/sessions
diff -r e489aabf88e4 -r aa280f39150b debian/littlebird-tc-core.postinst
--- a/debian/littlebird-tc-core.postinst	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/littlebird-tc-core.postinst	Sun Feb 19 23:34:32 2012 +0100
@@ -24,23 +24,31 @@
 case "$1" in
     configure)
 
-    dirs="/var/log/littlebird-tc /var/lib/littlebird-tc/CA /var/lib/littlebird-tc/data"
-    chgrp -R www-data $dirs
-    chmod -R g+w $dirs
+    # some of these dirs may not be installed (notably /var/logs seems
+    # not to be installed anymore (told me by Stefan Kögel - 2012-02-15)
+    for dir in /var/log/littlebird-tc /var/lib/littlebird-tc/CA /var/lib/littlebird-tc/data
+    do
+	test -d "$dir" && chgrp -R www-data $dir
+	test -d "$dir" && chmod -R g+w $dir
+    done
 
     # Timezone in /usr/local/zend/etc/php.ini
     # note: this file is handled as a conffile under ucf control
     f=/usr/local/zend/etc/php.ini
-    perl -pi -e 's{^;?\s*(date\.timezone\s*=).*$}{$1 "Europe/Berlin"}' $f
+    test -f $f \
+    && perl -pi -e 's{^;?\s*(date\.timezone\s*=).*$}{$1 "Europe/Berlin"}' $f
 
     # not sure if this conforms to policy: changing another packages
-    # config files
+    # config files: if a /usr/local/zend/etc/conf.php.ini exists, we'll
+    # link the "official" php.ini to this local php.ini
+    # 2012-02-15: I think, it is not necessary anymore, since the
+    # zend-server is not used anymore.
     if test -d /etc/php5/cli; then
 	#echo "# linking php.ini to zend" >&2
 	( set -e
 	  cd /etc/php5/cli
 	  s=/usr/local/zend/etc/conf.php.ini
-	  if test `readlink -f php.ini` != `readlink -f $s`
+	  if test -f $s && test `readlink -f php.ini` != `readlink -f $s`
 	  then
 	      rm -vf php.ini
 	      ln -vs $s php.ini
@@ -55,7 +63,7 @@
 	  for p in mysqli.ini curl.ini mcrypt.ini gd.ini
 	  do
 	    s=/usr/local/zend/etc/conf.d/$p
-	    if test `readlink -f $p` != `readlink -f $s`
+	    if test -f $s && test `readlink -f $p` != `readlink -f $s`
 	    then
 		rm -vf $p
 		ln -vs $s .
@@ -193,13 +201,16 @@
 
     db_stop || true
 	( . /etc/apache2/envvars
-	  invoke=`which invoke-rc.d`
-	  if ! apache2 -M 2>/dev/null | grep -q ssl_module; then
-		  a2enmod ssl
-		  test "$invoke" && $invoke apache2 restart >&2
-	  else
-		  test "$invoke" && $invoke apache2 reload >&2
-	  fi
+	  invoke=
+	  for module in ssl rewrite; do
+	      if ! apache2 -M 2>/dev/null | grep -q ${module}_module; then
+		      a2enmod $module
+		      invoke=`which invoke-rc.d`
+	      fi
+	   done
+	   # for ssl reload doesn't suffice, using restart we're on the
+	   # safe side
+	   test "$invoke" && $invoke apache2 restart >&2 || true
 	)
 
     ;;
diff -r e489aabf88e4 -r aa280f39150b debian/littlebird-tc-sql.config
--- a/debian/littlebird-tc-sql.config	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/littlebird-tc-sql.config	Sun Feb 19 23:34:32 2012 +0100
@@ -5,7 +5,7 @@
 
 
 prefix=littlebird-tc
-myaccess_ok() { mysql -h"$1" -u"$2" -p"$3" -e ""; }
+#not needed anymore myaccess_ok() { mysql -h"$1" -u"$2" -p"$3" -e ""; }
 
 
 if test "$1" = "clear"; then
diff -r e489aabf88e4 -r aa280f39150b debian/patches/add-missing-application-ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/add-missing-application-ini	Sun Feb 19 23:34:32 2012 +0100
@@ -0,0 +1,51 @@
+--- /dev/null
++++ b/TrustCenter/application/configs/application_installation.ini
+@@ -0,0 +1,48 @@
++phpSettings.display_startup_errors = 1
++phpSettings.display_errors = 1
++
++resources.frontController.env = development
++
++resources.db.params.host = localhost
++resources.db.params.username = user
++resources.db.params.password = pass
++resources.db.params.port = 3306
++resources.db.params.dbname = dbname
++resources.db.params.cryptKey = crypted
++
++resources.session.cookie_lifetime = 0
++
++littlebird.connection.enableFirePhp = 1
++littlebird.connection.firePhpOutputToFile = 0
++littlebird.connection.firePhpOutputFile = /opt/lb_trustcenter_local_db_profiler_output.txt
++
++littlebird.communication.active = 1
++littlebird.communication.verificationCA = /opt/LittleBird-Dev/CA/certs/Comodo_CA.pem
++
++littlebird.portal.url = https://test.portal.little-bird.de:9444
++littlebird.portal.weburl = https://test.portal.little-bird.de:9443
++littlebird.portal.requestTokenUrl = https://test.portal.little-bird.de:9443/Helper/Request-Token/:helperAction/:trustcenterID/:instituteID
++littlebird.portal.handleTokenUrl = https://test.portal.little-bird.de:9443/Helper/Handle-Token/:tokenID
++
++littlebird.trustcenter.id = 04000000-e6ca-4676-ac4d-c24a1e20c64a
++littlebird.trustcenter.url = https://dev.trustcenter.littlebird.local
++littlebird.trustcenter.sendemail = 1
++littlebird.trustcenter.gmapkey = ABQIAAAAFfpW1i0B8Cj_MbRiLDCyxRRwvbsKDj1pm02Tr5MuLrmR7Zt--RQ2eGWxaTwX9uJBvQcg2Y4EACRTGg
++littlebird.trustcenter.openssl_ca_dir = /opt/LittleBird-Dev/CA/
++littlebird.trustcenter.openssl_crl_file = /opt/LittleBird-Dev/CA/crl/tc.crl
++littlebird.trustcenter.openssl_config_file = /opt/LittleBird-Dev/CA/config.cnf
++littlebird.trustcenter.openssl_ca_crt = /opt/LittleBird-Dev/CA/certs/Test_Trustcenter_CA_LB.pem
++littlebird.trustcenter.openssl_ca_key = /opt/LittleBird-Dev/CA/private/Test_Trustcenter_CA_LB.key.pem
++;littlebird.trustcenter.openssl_ca_key_passphrase =
++;littlebird.trustcenter.emailScriptFolder = mails_tc2
++ 
++littlebird.emails.trustcenter.email = noreply.local@little-bird.de
++littlebird.emails.trustcenter.name = Little-Bird Trustcenter Lokal
++littlebird.trustcenter.sendeachemailto = dev@little-bird.de
++
++littlebird.emails.errorsendto.active = 0
++
++littlebird.zabbix.enable = 0
++;littlebird.zabbix.server = 
++;littlebird.zabbix.port = 
++;littlebird.zabbix.hostname = 
diff -r e489aabf88e4 -r aa280f39150b debian/patches/create-missing-ca
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/create-missing-ca	Sun Feb 19 23:34:32 2012 +0100
@@ -0,0 +1,60 @@
+--- /dev/null
++++ b/CA/.placeholder
+@@ -0,0 +1 @@
++just sitting here as a placeholder for my parent directory
+--- /dev/null
++++ b/CA/certs/README
+@@ -0,0 +1,3 @@
++The installed CA files are just SnakeOil CAs, serving
++as a placeholder for the real CA.
++-- Heiko Schlittermann
+--- /dev/null
++++ b/CA/certs/Trustcenter_CA.pem
+@@ -0,0 +1,22 @@
++-----BEGIN CERTIFICATE-----
++MIIDpTCCAw6gAwIBAgIJAOfgsnfu8JqlMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
++VQQGEwJERTEPMA0GA1UECBMGU2F4b255MRAwDgYDVQQHEwdEcmVzZGVuMRMwEQYD
++VQQKEwpMaXR0bGVCaXJkMSAwHgYDVQQLExdUcnVzdGNlbnRlciBTbmFrZU9pbCBD
++QTErMCkGA1UEAxMiTGl0dGxlQmlyZCBUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTAe
++Fw0xMjAyMTkyMDMzNTRaFw0xNDExMTUyMDMzNTRaMIGUMQswCQYDVQQGEwJERTEP
++MA0GA1UECBMGU2F4b255MRAwDgYDVQQHEwdEcmVzZGVuMRMwEQYDVQQKEwpMaXR0
++bGVCaXJkMSAwHgYDVQQLExdUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTErMCkGA1UE
++AxMiTGl0dGxlQmlyZCBUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTCBnzANBgkqhkiG
++9w0BAQEFAAOBjQAwgYkCgYEA1/ZLQsL6eHtporlZxIwWqP4UBo49w98iaAqE4GEj
++gdvVZc8NceegNdvp690IWAqPcp+6/gE8R4sE57KS/Eo1nw3V6i++BjzL/8wvqnjj
++kvYSf2rS5XOeu09W4SdW4mr6tOV/Gn3ypYkSiSn3I6SfI2aXa61rajJf8hZfBXwg
++v58CAwEAAaOB/DCB+TAdBgNVHQ4EFgQUXm4cyyqUlzGgcyaG1PGQs8WPG44wgckG
++A1UdIwSBwTCBvoAUXm4cyyqUlzGgcyaG1PGQs8WPG46hgZqkgZcwgZQxCzAJBgNV
++BAYTAkRFMQ8wDQYDVQQIEwZTYXhvbnkxEDAOBgNVBAcTB0RyZXNkZW4xEzARBgNV
++BAoTCkxpdHRsZUJpcmQxIDAeBgNVBAsTF1RydXN0Y2VudGVyIFNuYWtlT2lsIENB
++MSswKQYDVQQDEyJMaXR0bGVCaXJkIFRydXN0Y2VudGVyIFNuYWtlT2lsIENBggkA
++5+Cyd+7wmqUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBbNhR0PWJc
++q4lBw83EfZG8+UV9D1PJR8iVxpFaMPLjsBqqJs5HKl80aCMT+r7P9hcbCwKe5cHZ
++Pr82dBZVIUll8nh1qwWganMLHS51RGLMUk9tz8QaqRMVIjBf+fyXRLFWdWwXwzVm
++nv+GSS/G01PGKiCcBhElm9ZL+Oph95UO1A==
++-----END CERTIFICATE-----
+--- /dev/null
++++ b/CA/certs/Trustcenter_CA_LB.pem
+@@ -0,0 +1,22 @@
++-----BEGIN CERTIFICATE-----
++MIIDpTCCAw6gAwIBAgIJAOfgsnfu8JqlMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
++VQQGEwJERTEPMA0GA1UECBMGU2F4b255MRAwDgYDVQQHEwdEcmVzZGVuMRMwEQYD
++VQQKEwpMaXR0bGVCaXJkMSAwHgYDVQQLExdUcnVzdGNlbnRlciBTbmFrZU9pbCBD
++QTErMCkGA1UEAxMiTGl0dGxlQmlyZCBUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTAe
++Fw0xMjAyMTkyMDMzNTRaFw0xNDExMTUyMDMzNTRaMIGUMQswCQYDVQQGEwJERTEP
++MA0GA1UECBMGU2F4b255MRAwDgYDVQQHEwdEcmVzZGVuMRMwEQYDVQQKEwpMaXR0
++bGVCaXJkMSAwHgYDVQQLExdUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTErMCkGA1UE
++AxMiTGl0dGxlQmlyZCBUcnVzdGNlbnRlciBTbmFrZU9pbCBDQTCBnzANBgkqhkiG
++9w0BAQEFAAOBjQAwgYkCgYEA1/ZLQsL6eHtporlZxIwWqP4UBo49w98iaAqE4GEj
++gdvVZc8NceegNdvp690IWAqPcp+6/gE8R4sE57KS/Eo1nw3V6i++BjzL/8wvqnjj
++kvYSf2rS5XOeu09W4SdW4mr6tOV/Gn3ypYkSiSn3I6SfI2aXa61rajJf8hZfBXwg
++v58CAwEAAaOB/DCB+TAdBgNVHQ4EFgQUXm4cyyqUlzGgcyaG1PGQs8WPG44wgckG
++A1UdIwSBwTCBvoAUXm4cyyqUlzGgcyaG1PGQs8WPG46hgZqkgZcwgZQxCzAJBgNV
++BAYTAkRFMQ8wDQYDVQQIEwZTYXhvbnkxEDAOBgNVBAcTB0RyZXNkZW4xEzARBgNV
++BAoTCkxpdHRsZUJpcmQxIDAeBgNVBAsTF1RydXN0Y2VudGVyIFNuYWtlT2lsIENB
++MSswKQYDVQQDEyJMaXR0bGVCaXJkIFRydXN0Y2VudGVyIFNuYWtlT2lsIENBggkA
++5+Cyd+7wmqUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBbNhR0PWJc
++q4lBw83EfZG8+UV9D1PJR8iVxpFaMPLjsBqqJs5HKl80aCMT+r7P9hcbCwKe5cHZ
++Pr82dBZVIUll8nh1qwWganMLHS51RGLMUk9tz8QaqRMVIjBf+fyXRLFWdWwXwzVm
++nv+GSS/G01PGKiCcBhElm9ZL+Oph95UO1A==
++-----END CERTIFICATE-----
diff -r e489aabf88e4 -r aa280f39150b debian/patches/series
--- a/debian/patches/series	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/patches/series	Sun Feb 19 23:34:32 2012 +0100
@@ -1,2 +1,2 @@
-current-user
-db-update
+create-missing-ca
+add-missing-application-ini
diff -r e489aabf88e4 -r aa280f39150b debian/rules
--- a/debian/rules	Fri Oct 14 14:44:08 2011 +0200
+++ b/debian/rules	Sun Feb 19 23:34:32 2012 +0100
@@ -18,7 +18,7 @@
 override_dh_install:
 #	BUG: find TrustCenter/ -not \( -regex '\.gitignore' \) \( -type d -and -empty \)
 	@dh_install --fail-missing
-	@cd ${core}/usr/share/littlebird-tc/CA/certs \
+	@-cd ${core}/usr/share/littlebird-tc/CA/certs 2>/dev/null \
 	&& { \
 	   test -f Trustcenter_CA_LB.pem || cp -av Test_Trustcenter_CA_LB.pem Trustcenter_CA_LB.pem; \
 	   test -f Trustcenter_CA.pem || cp -av Test_Trustcenter_CA.pem Trustcenter_CA.pem; \
@@ -26,7 +26,7 @@
 
 	# move logs and data to var/
 	@mv ${core}/usr/share/littlebird-tc/CA ${core}/var/lib/littlebird-tc
-	@mv ${core}/usr/share/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc 
+	@-mv ${core}/usr/share/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc 
 	@mv ${core}/usr/share/littlebird-tc/TrustCenter/data ${core}/var/lib/littlebird-tc
 #	MUST FIX: directory 'instituteTypes' does not exist in original sorces
 	#@mv ${core}/usr/share/littlebird-tc/TrustCenter/public/images/icons/instituteTypes/* \