bunix42/docker-ttrss
1
0
Fork 0
Code Releases Activity

Merge 9f3d09245ab19446050cf3fdc618243a60d53c79 into b770335bcb93a199f95c508ee3675489a2b3a0c8

Browse Source
This commit is contained in:
Bill Thornton 2015-08-15 17:43:38 +00:00
commit 6607ef86b8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

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

2
configure-db.php
View File

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

4
supervisord.conf
View File

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

2
ttrss.nginx.conf
View File

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