1
0
Fork 0

Fix in-place upgrading of TT-RSS

pull/9/head
billt2006 10 years ago
parent f6e953765f
commit 9f3d09245a

@ -11,8 +11,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 sed -i -e "/'SELF_URL_PATH'/s/ '.*'/ 'http:\/\/localhost\/'/" config.php
RUN chown www-data:www-data -R /var/www

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

@ -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

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

Loading…
Cancel
Save