Revert to wheezy-backports version, because jessie failed (put in a different branch)

Dockerfile

@@ -1,12 +1,9 @@
-FROM debian:jessie
+FROM debian:wheezy-backports
 MAINTAINER Gabriele Facciolo <gfacciol@gmail.com>
 # Following http://git.27o.de/dataserver/about/Installation-Instructions-for-Debian-Wheezy.md
 
 # debian packages
-RUN apt-get update
-RUN echo "mysql-server mysql-server/root_password password password" | debconf-set-selections
-RUN echo "mysql-server mysql-server/root_password_again password password" | debconf-set-selections
-RUN apt-get install -y \
+RUN apt-get update && apt-get install -y \
     apache2 libapache2-mod-php5 mysql-server memcached zendframework php5-cli php5-memcached php5-mysql php5-curl \
     apache2 uwsgi uwsgi-plugin-psgi libplack-perl libdigest-hmac-perl libjson-xs-perl libfile-util-perl libapache2-mod-uwsgi libswitch-perl \
     git gnutls-bin runit wget curl net-tools vim build-essential
@@ -35,14 +32,17 @@ RUN cd /srv/zotero/dataserver/include && rm -r Zend && ln -s /usr/share/php/Zend
 #certtool -s --load-privkey /etc/apache2/zotero.key --outfile /etc/apache2/zotero.cert
 ADD apache/zotero.key /etc/apache2/
 ADD apache/zotero.cert /etc/apache2/
-ADD apache/sites-zotero.conf /etc/apache2/sites-enabled/zotero.conf
+ADD apache/sites-zotero.conf /etc/apache2/sites-available/zotero
 ADD apache/dot.htaccess  /srv/zotero/dataserver/htdocs/\.htaccess
-RUN a2enmod ssl && a2enmod rewrite
+RUN a2enmod ssl && \
+    a2enmod rewrite && \
+    a2ensite zotero
 
 #Mysql
 ADD mysql/zotero.cnf /etc/mysql/conf.d/zotero.cnf
 ADD mysql/setup_db /srv/zotero/dataserver/misc/setup_db
 RUN /etc/init.d/mysql start && \
+    mysqladmin -u root password password && \
     cd /srv/zotero/dataserver/misc/ && \
     ./setup_db
 
@@ -58,15 +58,30 @@ RUN cd /etc/service && \
     ln -s ../sv/zotero-error /etc/service/ 
 
 
+
 # ZSS
 RUN git clone --depth=1 git://git.27o.de/zss /srv/zotero/zss && \
     mkdir /srv/zotero/storage && \
     chown www-data:www-data /srv/zotero/storage
 
-ADD zss/zss.yaml /etc/uwsgi/apps-enabled/zss.yaml
+ADD zss/zss.yaml /etc/uwsgi/apps-available/
 ADD zss/ZSS.pm   /srv/zotero/zss/
 ADD zss/zss.psgi /srv/zotero/zss/
-ADD patches/uwsgi /etc/init.d/uwsgi
+RUN ln -s /etc/uwsgi/apps-available/zss.yaml /etc/uwsgi/apps-enabled 
+# fix uwsgi init scipt (always fails)
+ADD patches/uwsgi /etc/init.d/uwsgi 
+
+
+## failed attempt to install Zotero Web-Library locally
+## not working
+#RUN cd /srv/ && \
+#    git clone --depth=1 --recursive https://github.com/zotero/web-library.git && \
+#    curl -sL https://deb.nodesource.com/setup_4.x | bash - && apt-get install -y nodejs && \
+#    cd /srv/web-library && \
+#    npm install && \
+#    npm install prompt
+
+
 
 
 # replace custom /srv/zotero/dataserver/admin/add_user that allows to write the password
@@ -80,12 +95,10 @@ RUN service mysql start && service memcached start && \
     ./add_group -o test -f members -r members -e members testgroup && \
     ./add_groupuser testgroup test2 member 
 
-#ADD ./apache/apache2.conf /etc/apache2/apache2.conf
+
 # docker server startup
 EXPOSE 80 443
 
-VOLUME [ "/var/lib/mysql", "/srv/zotero/storage" ]
-
 CMD service mysql start && \
     service uwsgi start && \
     service apache2 start && \

README.md

@@ -42,7 +42,7 @@ If the server uses a self-signed certificate an exception should be added to the
     ~/.zotero/Profiles/<random>.default/                                  Linux
     c:Users/<username>/AppData/Roaming/Zotero/Zotero/                     Win
 
-The `cert\_override.txt` file can be generated with Firefox as explained here (https://groups.google.com/d/msg/zotero-dev/MEwLaptJIzI/PVDAFJiqEgAJ)
+The `cert\_override.txt` file can be generated with Firefox as explained here (https://groups.google.com/d/msg/zotero-dev/MEwLaptJIzI/PVDAFJiqEgAJ). The override file in this directory corresponds to the self-signed certificate in the apache directory.
 
 
 ## User administration

apache/sites-zotero.conf

@@ -1,23 +1,23 @@
-# <VirtualHost *:80>
-#         DocumentRoot /srv/web-library
-#         <Directory />
-#                 Options FollowSymLinks
-#                 AllowOverride None
-#         </Directory>
-#         <Directory /srv/web-library/>
-#                 Options Indexes FollowSymLinks MultiViews
-#                 AllowOverride None
-#                 Order allow,deny
-#                 allow from all
-#         </Directory>
-# </VirtualHost>
+<VirtualHost *:80>
+        DocumentRoot /srv/web-library
+        <Directory />
+                Options FollowSymLinks
+                AllowOverride None
+        </Directory>
+        <Directory /srv/web-library/>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+        </Directory>
+</VirtualHost>
+
 
 <VirtualHost *:443>
   DocumentRoot /srv/zotero/dataserver/htdocs
   SSLEngine on
   SSLCertificateFile /etc/apache2/zotero.cert
   SSLCertificateKeyFile /etc/apache2/zotero.key
-  php_value short_open_tag 1
 
   <Location /zotero/>
     SetHandler uwsgi-handler
@@ -28,7 +28,17 @@
   <Directory "/srv/zotero/dataserver/htdocs/">
     Options FollowSymLinks MultiViews
     AllowOverride All
-    Require all granted
+
+#2.2
+    Order allow,deny
+    Allow from all
+# 2.4
+ #    Require all granted 
+ #
+    # If you are using a more recent version of apache 
+    # and are getting 403 errors, replace the Order and
+    # Allow lines with:
+    # Require all granted
   </Directory>
 
   ErrorLog /srv/zotero/log/error.log