From fc0ebb349f32371c789c03119613d9d281048763 Mon Sep 17 00:00:00 2001 From: Dave Lane Date: Thu, 1 Aug 2019 03:41:13 +0000 Subject: [PATCH] updates to configurations --- docker-wenotes-base/Dockerfile | 4 ++-- docker-wenotes-pm2/conf/services.yml | 8 ++++---- docker-wenotes-tools/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-wenotes-base/Dockerfile b/docker-wenotes-base/Dockerfile index 1e66a02..a4e48f6 100644 --- a/docker-wenotes-base/Dockerfile +++ b/docker-wenotes-base/Dockerfile @@ -88,8 +88,8 @@ RUN apt-get install -y less net-tools vim # install Node.JS repos and do another update... RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo 'deb https://deb.nodesource.com/node_4.x trusty main' > /etc/apt/sources.list.d/nodesource.list \ - && echo 'deb-src https://deb.nodesource.com/node_4.x trusty main' >> /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_4.x xenial main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb-src https://deb.nodesource.com/node_4.x xenial main' >> /etc/apt/sources.list.d/nodesource.list \ && apt-get update -y -qq # Download dev dependencies RUN apt-get install -y --no-install-recommends \ diff --git a/docker-wenotes-pm2/conf/services.yml b/docker-wenotes-pm2/conf/services.yml index bbeb8d2..13123fd 100644 --- a/docker-wenotes-pm2/conf/services.yml +++ b/docker-wenotes-pm2/conf/services.yml @@ -4,16 +4,16 @@ apps: - script : 'couchwatch.js' name : 'CouchWatch' merge_logs : true - out_file : '/tmp/couchwatch.log' + out_file : '/opt/wenotes/logs/couchwatch.log' - script : 'twitters.js' name : 'Twitter Stream Watcher' merge_logs : true - out_file : '/tmp/twitters.log' + out_file : '/opt/wenotes/logs/twitters.log' - script : 'irc.js' name : 'IRC Watcher' merge_logs : true - out_file : '/tmp/irc.log' + out_file : '/opt/wenotes/logs/irc.log' - script : 'wenotestochat.js' name : 'WENotes to Chat' merge_logs : true - out_file : '/tmp/wenotestochat.log' + out_file : '/opt/wenotes/logs/wenotestochat.log' diff --git a/docker-wenotes-tools/Dockerfile b/docker-wenotes-tools/Dockerfile index 327fdc4..c5670c9 100644 --- a/docker-wenotes-tools/Dockerfile +++ b/docker-wenotes-tools/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ echo "PY=/usr/bin/python"; \ echo '8,18,28,38,48,58 * * * * root cd $WEDIR && nice $PY bookmarks.py && nice $PY medium.py'; \ echo '6,16,26,36,46,56 * * * * root cd $WEDIR && nice $PY mastodon.py && nice $PY hypothesis.py'; \ - echo '4,14,24,34,44,54 * * * * root cd $WEDIR && nice $PY saylor-discourse.py && nice $PY feeds.py && nice $PY blog_feed.py'; \ + echo '4,14,24,34,44,54 * * * * root cd $WEDIR && nice $PY saylor-discourse.py && nice $PY blog_feed.py'; \ echo '2,12,22,32,42,52 * * * * root cd $WEDIR && nice $PY forums.py && nice $PY discourse.py --full'; \ echo '*/1 * * * * root echo "Cron ran at $(date)" >> $LOG'; \ } | tee /etc/cron.d/wenotes-cron -- GitLab