Current state

diff --git a/apache2/modules.d/20_mod_fcgid.conf b/apache2/modules.d/20_mod_fcgid.conf
new file mode 100644 (file)
index 0000000..e68970e
--- /dev/null
+++ b/apache2/modules.d/20_mod_fcgid.conf
@@ -0,0 +1,10 @@
+<IfDefine FCGID>
+LoadModule fcgid_module modules/mod_fcgid.so
+SocketPath /var/run/fcgidsock
+SharememPath /var/run/fcgid_shm
+AddHandler fastcgi-script fcg fcgi fpl
+FastCgiExternalServer /tmp/frbr_books_app.fcgi -socket /tmp/frbr_books_app.sock
+#FastCgiServer /var/www/books/script/frbr_books_fastcgi.pl -processes 2
+</IfDefine>
+
+# vim: ts=4 filetype=apache

diff --git a/apache2/vhosts.d/02_morph.conf b/apache2/vhosts.d/02_morph.conf
index da18fedfd10ac3dd72d3eb0a3e08fa7cc644a18b..71dade4e5a838945f8ae454c6e62b517c319cfcc 100644 (file)
--- a/apache2/vhosts.d/02_morph.conf
+++ b/apache2/vhosts.d/02_morph.conf
@@ -1,23 +1,3 @@
-<VirtualHost *:80>
-
-    ServerName ddr.bmrmorph.de
-    ServerAlias www.ddr.bmrmorph.de
-
-    DocumentRoot /home/morph/htdocs/ddr.bmrmorph.de
-
-    ErrorLog /var/log/apache2/morph-error.log
-    LogLevel warn
-    CustomLog /var/log/apache2/morph-access.log full
-
-    <Directory "/home/morph/htdocs/ddr.bmrmorph.de">
-        Options -Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-</VirtualHost>
-
 <VirtualHost *:80>
 
     ServerName allianz-der-schattenritter.de

diff --git a/apache2/vhosts.d/11-books-nossl.conf b/apache2/vhosts.d/11-books-nossl.conf
index 06157c96e72960b17e9a2f3651b6d1ddf59ed6cc..94bef70ab110d0edb8188968f208d00c4a1fd7e9 100644 (file)
--- a/apache2/vhosts.d/11-books-nossl.conf
+++ b/apache2/vhosts.d/11-books-nossl.conf
@@ -1,7 +1,7 @@
 <IfDefine FASTCGI>
-    <VirtualHost *:80>
-        Include /etc/apache2/vhosts.d/books_vhost.include
-    </VirtualHost>
+<VirtualHost *:80>
+   Include /etc/apache2/vhosts.d/books_vhost.include
+</VirtualHost>
 </IfDefine>
 
 # vim: ts=4 filetype=apache expandtab fileencoding=utf-8

diff --git a/php/apache2-php5.3/php.ini b/php/apache2-php5.3/php.ini
index 009636ba8018c8199a3687658eb529bd9c0cfeca..2df0a7f60a3c489819c0b5030ffc0ff40cef0c90 100644 (file)
--- a/php/apache2-php5.3/php.ini
+++ b/php/apache2-php5.3/php.ini
@@ -536,7 +536,6 @@ error_reporting = E_ALL | E_STRICT
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-errors
-;display_errors = On
 display_errors = stderr
 
 ; The display of errors which occur during PHP's startup sequence are handled
@@ -1009,7 +1008,7 @@ default_socket_timeout = 60
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-;date.timezone =
+;date.timezone = Europe/Berlin
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667
@@ -1491,7 +1490,8 @@ session.save_handler = files
 ; where MODE is the octal representation of the mode. Note that this
 ; does not overwrite the process's umask.
 ; http://php.net/session.save-path
-session.save_path = "/var/lib/php/session"
+;session.save_path = "/var/lib/php/session"
+session.save_path = "/tmp"
 
 ; Whether to use cookies.
 ; http://php.net/session.use-cookies

diff --git a/portage b/portage
index 76d5d23937aca806bb41f8427f45931237e7b49e..c762175fb4d7460cd4e688277bbe710860397d2f 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 76d5d23937aca806bb41f8427f45931237e7b49e
+Subproject commit c762175fb4d7460cd4e688277bbe710860397d2f