Fix broken nzedb 0.7.0.0 upgrade

README.md

@@ -104,6 +104,8 @@ Developer commands:
 ```
 
 ## Upgrading to a newer version of nZEDb
+See UPGRADE.md for version specific upgrade instructions.
+
 - Run ```git pull``` to update to the latest docker files
 - Run ```make pull``` to pull the latest docker images
 - Run ```make start``` to restart nZEDb. The database schema is updated if necessary when starting up.

UPGRADE.md

@@ -0,0 +1,12 @@
+*Upgrade from nzedb 0.6.9.0 to 0.7.0.0*
+
+The upgrade to nzedb 0.7.0.0 requires some manual steps to fix:
+```
+$ mkdir data/configuration
+$ mv data/config.php data/configuration/
+$ mv data/ircscraper_settings.php data/configuration/
+$ mv data/settings.php data/configuration/
+$ touch data/configuration/install.lock
+$ touch data/log/php_errors_web.log
+$ chmod -R 777 data/configuration
+```

bin/setup_data_dir

@@ -1,14 +1,14 @@
 #!/bin/bash
 echo "Creating data directory..."
-mkdir -p data
+mkdir -p data/configuration
 
 # Read in all custom settings as env vars
 source etc/simply_nzedb.conf
 
-cp etc/settings.php.example data/settings.php
+cp etc/settings.php.example data/configuration/settings.php
 
-cp etc/config.php.example data/config.php
-target="data/config.php"
+cp etc/config.php.example data/configuration/config.php
+target="data/configuration/config.php"
 
 # Ripped from http://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux
 if [ "$(uname)" == "Darwin" ]; then
@@ -74,6 +74,7 @@ mkdir -p data/db_backups
 touch data/log/nginx-access.log
 touch data/log/nginx-error.log
 touch data/log/php_errors.log
+touch data/log/php_errors_web.log
 touch data/log/php-fpm.log
 
 # File that lets mysql container know user id/gid on host
@@ -87,12 +88,13 @@ EOF
 touch data/predb_progress.txt
 
 # irc scraper 
-cp etc/ircscraper_settings_example.php data/ircscraper_settings.php
-$sed "s/changeme_irc_username/${IRC_USERNAME}/g" data/ircscraper_settings.php
-$sed "s/changeme_irc_server/${IRC_SERVER}/g" data/ircscraper_settings.php
-$sed "s/changeme_irc_port/${IRC_PORT}/g" data/ircscraper_settings.php
-$sed "s/changeme_irc_tls/false/g" data/ircscraper_settings.php
-$sed "s/changeme_irc_password/${IRC_PASSWORD}/g" data/ircscraper_settings.php
+target="data/configuration/ircscraper_settings.php"
+cp etc/ircscraper_settings_example.php $target
+$sed "s/changeme_irc_username/${IRC_USERNAME}/g" $target
+$sed "s/changeme_irc_server/${IRC_SERVER}/g" $target
+$sed "s/changeme_irc_port/${IRC_PORT}/g" $target
+$sed "s/changeme_irc_tls/false/g" $target
+$sed "s/changeme_irc_password/${IRC_PASSWORD}/g" $target
 
 # proxychains for socks proxy
 cp etc/proxychains.conf.example data/proxychains.conf

common.yml

@@ -27,17 +27,21 @@ services:
       - $PWD/data/covers:/var/www/nZEDb/resources/covers/
       - $PWD/data/nzb:/var/www/nZEDb/resources/nzb/
       - $PWD/data/tmp:/var/www/nZEDb/resources/tmp/unrar/
-      - $PWD/data/config.php:/var/www/nZEDb/configuration/config.php
-      - $PWD/data/settings.php:/var/www/nZEDb/configuration/settings.php
+      # configuration/ is expected to contain
+      #  - config.php
+      #  - ircscraper_settings.php
+      #  - settings.php
+      #  - install.lock (only after setup has completed)
+      - $PWD/data/configuration:/var/www/nZEDb/configuration/
       - $PWD/data/log/nginx-error.log:/var/log/nginx/nginx-error.log
       - $PWD/data/log/nginx-access.log:/var/log/nginx/access.log
       - $PWD/data/log/php-fpm.log:/var/log/php-fpm.log
       - $PWD/data/log/php_errors.log:/var/www/nZEDb/resources/logs/php_errors.log
+      - $PWD/data/log/php_errors_web.log:/var/www/nZEDb/resources/logs/php_errors_web.log
       - $PWD/data/nginx.conf:/etc/nginx/nginx.conf
       - $PWD/data/mytop:/root/.mytop
       - $PWD/data/predb_progress.txt:/var/www/nZEDb/cli/data/predb_progress.txt
       - $PWD/data/import:/var/www/nZEDb/resources/import/
-      - $PWD/data/ircscraper_settings.php:/var/www/nZEDb/configuration/ircscraper_settings.php
       - $PWD/data/proxychains.conf:/etc/proxychains/proxychains.conf
       - $PWD/data/db_backups:/db_backups
 

nzedb/Dockerfile

@@ -87,10 +87,11 @@ RUN apk --update add boost-dev boost-regex gcc g++ swig && \
   g++ -shared *.o -o simple_php_yenc_decode.so -lboost_regex && \
   mkdir -p /usr/lib64/php/extensions && \
   cp -p simple_php_yenc_decode.so /usr/lib64/php/extensions && \
-  sed -ri s,extension=,extension=/usr/lib64/php/extensions/simple_php_yenc_decode.so,g /etc/php5/php.ini && \
+  cp /etc/php5/php.ini /etc/php5/php.ini.original && \
+  sed -ri "s|;extension=php_snmp.dll|extension=/usr/lib64/php/extensions/simple_php_yenc_decode.so|" /etc/php5/php.ini && \
   cd ~ && \
   rm -rf /tmp && \
-  apk del --purge boost-dev boost-regex gcc g++ swig && \
+  apk del --purge boost-dev gcc g++ swig && \
   rm -rf /var/cache/apk/*
 
 # Build and install mediainfo
@@ -139,8 +140,7 @@ RUN mkdir -p /var/www && \
   cd /var/www/nZEDb && \
   git checkout --quiet --force $NZEDB_VERSION && \
   composer install && \
-	chmod -R 777 /var/www/nZEDb/ && \
-	cp /var/www/nZEDb/configuration/settings.example.php /var/www/nZEDb/configuration/settings.php && \
+  chmod -R 777 /var/www/nZEDb/ && \
   # nuke all git repos' .git dir except for nzedb's .git dir to save space
   find . -name ".git" -type d | grep -v "\.\/\.git" | xargs rm -rf && \
   # nuke ~350MB of composer cache