Merge 9f3d09245ab19446050cf3fdc618243a60d53c79 into b770335bcb93a199f95c508ee3675489a2b3a0c8

Dockerfile

@@ -14,8 +14,8 @@ RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
 RUN rm /etc/nginx/sites-enabled/default
 
 # install ttrss and patch configuration
-RUN git clone https://github.com/gothfox/Tiny-Tiny-RSS.git /var/www
-WORKDIR /var/www
+RUN git clone https://github.com/gothfox/Tiny-Tiny-RSS.git /var/www/tt-rss
+WORKDIR /var/www/tt-rss
 RUN cp config.php-dist config.php
 RUN chown www-data:www-data -R /var/www
 

configure-db.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-$confpath = '/var/www/config.php';
+$confpath = '/var/www/tt-rss/config.php';
 
 $config = array();
 

supervisord.conf

@@ -1,4 +1,6 @@
 [supervisord]
+logfile=/var/log/supervisord.log
+pidfile=/var/run/supervisord.pid
 nodaemon=true
 
 [program:php5-fpm]
@@ -8,7 +10,7 @@ command=/usr/sbin/php5-fpm --nodaemonize
 command=/usr/sbin/nginx -g "daemon off;"
 
 [program:ttrss-update-daemon]
-command=/usr/bin/php /var/www/update_daemon2.php
+command=/usr/bin/php /var/www/tt-rss/update_daemon2.php
 user=www-data
 stdout_logfile=/tmp/%(program_name)s.stdout
 stderr_logfile=/tmp/%(program_name)s.stderr

ttrss.nginx.conf

@@ -1,6 +1,6 @@
 server {
 	listen 80;
-	root /var/www;
+	root /var/www/tt-rss;
 
 	index index.php index.html;