# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1316208239 -7200 # Node ID 39b02aed056bb8bba7f6cf4dd34613e7c06bfbe5 # Parent 94ec1603ce3ca50b5f79169f6bc4cd725af816c6 * moved to /usr/share/littlebird-tc diff -r 94ec1603ce3c -r 39b02aed056b debian/examples/apache/littlebird-tc.conf --- a/debian/examples/apache/littlebird-tc.conf Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/examples/apache/littlebird-tc.conf Fri Sep 16 23:23:59 2011 +0200 @@ -24,8 +24,8 @@ # debconf: ServerName {{servername}} ServerName www.example.com - DocumentRoot /usr/lib/littlebird-tc/TrustCenter/public - + DocumentRoot /usr/share/littlebird-tc/TrustCenter/public + RewriteEngine On RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] @@ -47,8 +47,8 @@ SSLVerifyClient require SSLVerifyDepth 2 - SSLCACertificateFile /usr/lib/littlebird-tc/CA/certs/Trustcenter_CA_LB.pem - SSLCADNRequestFile /usr/lib/littlebird-tc/CA/certs/Trustcenter_CA.pem + SSLCACertificateFile /usr/share/littlebird-tc/CA/certs/Trustcenter_CA_LB.pem + SSLCADNRequestFile /usr/share/littlebird-tc/CA/certs/Trustcenter_CA.pem SSLVerifyClient none diff -r 94ec1603ce3c -r 39b02aed056b debian/littlebird-tc-core.install --- a/debian/littlebird-tc-core.install Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/littlebird-tc-core.install Fri Sep 16 23:23:59 2011 +0200 @@ -1,2 +1,2 @@ -{CA,library,TrustCenter,RestInterface} /usr/lib/littlebird-tc +{CA,library,TrustCenter,RestInterface} /usr/share/littlebird-tc debian/examples/apache /usr/share/doc/littlebird-tc/examples diff -r 94ec1603ce3c -r 39b02aed056b debian/littlebird-tc-core.links --- a/debian/littlebird-tc-core.links Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/littlebird-tc-core.links Fri Sep 16 23:23:59 2011 +0200 @@ -1,1 +1,1 @@ -/var/log/littlebird-tc /usr/lib/littlebird-tc/TrustCenter/data/logs +/var/log/littlebird-tc /usr/share/littlebird-tc/TrustCenter/data/logs diff -r 94ec1603ce3c -r 39b02aed056b debian/littlebird-tc-core.postinst --- a/debian/littlebird-tc-core.postinst Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/littlebird-tc-core.postinst Fri Sep 16 23:23:59 2011 +0200 @@ -171,7 +171,7 @@ if ($o{serverport} eq "443") { $o{serverurl} = "https://$o{servername}" } else { $o{serverurl} = "https://$o{servername}:$o{serverport}" } - open(F, "+ ; s|^(\Qresources.db.params.dbname\E\s*=).*|$1 $o{dbname}|mig; @@ -179,7 +179,7 @@ s|^(\Qresources.db.params.username\E\s*=).*|$1 $o{dbuser}|mig; s|^(\Qresources.db.params.password\E\s*=).*|$1 $o{dbpass}|mig; s|^(\Qlittlebird.trustcenter.url\E\s*=).*|$1 $o{serverurl}|mig; - s|/opt/LittleBird/LittleBird(?:-Test)?|/usr/lib/littlebird-tc|mig; + s|/opt/LittleBird/LittleBird(?:-Test)?|/usr/share/littlebird-tc|mig; seek(F, 0, 0); print(F $_); truncate(F, tell F); diff -r 94ec1603ce3c -r 39b02aed056b debian/littlebird-tc-sql.install --- a/debian/littlebird-tc-sql.install Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/littlebird-tc-sql.install Fri Sep 16 23:23:59 2011 +0200 @@ -1,1 +1,1 @@ -Database /usr/lib/littlebird-tc/ +Database /usr/share/littlebird-tc/ diff -r 94ec1603ce3c -r 39b02aed056b debian/littlebird-tc-sql.postinst --- a/debian/littlebird-tc-sql.postinst Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/littlebird-tc-sql.postinst Fri Sep 16 23:23:59 2011 +0200 @@ -73,14 +73,14 @@ --user "$user" --pass "$pass" fi - if test -x /usr/lib/littlebird-tc/TrustCenter/scripts/install_update_db + if test -x /usr/share/littlebird-tc/TrustCenter/scripts/install_update_db then env PATH=/usr/local/zend/bin:$PATH \ - /usr/lib/littlebird-tc/TrustCenter/scripts/install_update_db \ + /usr/share/littlebird-tc/TrustCenter/scripts/install_update_db \ "$adminuser" "$adminpass" else env PATH=/usr/local/zend/bin:$PATH \ - bash /usr/lib/littlebird-tc/TrustCenter/scripts/install_update_db.sh \ + sh /usr/share/littlebird-tc/TrustCenter/scripts/install_update_db.sh \ "$adminuser" "$adminpass" fi diff -r 94ec1603ce3c -r 39b02aed056b debian/rules --- a/debian/rules Fri Sep 16 23:18:13 2011 +0200 +++ b/debian/rules Fri Sep 16 23:23:59 2011 +0200 @@ -17,13 +17,13 @@ override_dh_install: @dh_install - @cd ${core}/usr/lib/littlebird-tc/CA/certs \ + @cd ${core}/usr/share/littlebird-tc/CA/certs \ && { \ 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; \ } - mv ${core}/usr/lib/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc - mv ${core}/usr/lib/littlebird-tc/TrustCenter/data/* ${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/* ${core}/var/lib/littlebird-tc/ find ${core} ${common} ${sql} -type f -exec chmod a-x {} + find ${core} ${common} ${sql} -type f \ \( -name '*.sh' -o -path '*/scripts/*' \) \ @@ -33,7 +33,7 @@ @dh_link for dir in ${core}/var/lib/littlebird-tc/*; do \ dir=`basename $$dir`; \ - dh_link --package littlebird-tc-core /var/lib/littlebird-tc/$$dir /usr/lib/littlebird-tc/TrustCenter/data/$$dir ;\ + dh_link --package littlebird-tc-core /var/lib/littlebird-tc/$$dir /usr/share/littlebird-tc/TrustCenter/data/$$dir ;\ done