From 1cd865c8e42ebeea5b4d698d8a95772126515579 Mon Sep 17 00:00:00 2001 From: Simon C Date: Tue, 24 Mar 2020 10:14:26 +0100 Subject: [PATCH] feat: Create container script to generate stats.html --- docker-compose.yml | 19 ++++++++++++++++++- package.json | 1 - themes/hugo-theme-lowtech | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 55da78b..cf779ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,17 +3,33 @@ version: "3.7" volumes: histoiredunpied-log-volume: name: histoiredunpied-log-volume + histoiredunpied-src: + name: histoiredunpied-src services: histoiredunpied-autopush: container_name: histoiredunpied-autopush - image: kosssi/davix:0.0.1 + image: registry.lamelio.fr/kosssi/autopush environment: GIT_USER: ${GIT_USER} GIT_URL: ${GIT_URL} GIT_REPOSITORY: ${GIT_REPOSITORY} DOWNLOAD_URL: ${DOWNLOAD_URL} WEBDAV_URL: ${WEBDAV_URL} + labels: + com.centurylinklabs.watchtower.enable: true + + histoiredunpied-logs: + container_name: histoiredunpied-logs + image: registry.lamelio.fr/kosssi/goaccess + environment: + FILE_LOG: /var/log/nginx/access.log + FILE_OUTPUT: /usr/share/nginx/html/stats.html + volumes: + - histoiredunpied-log-volume:/var/log/nginx + - histoiredunpied-src:/usr/share/nginx/html + labels: + com.centurylinklabs.watchtower.enable: true histoiredunpied: container_name: ${NAME} @@ -22,6 +38,7 @@ services: - TZ=${TIMEZONE} volumes: - histoiredunpied-log-volume:/var/log/nginx + - histoiredunpied-src:/usr/share/nginx/html labels: traefik.enable: "true" diff --git a/package.json b/package.json index 2155e35..325af25 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "favicon": "convert static/icon.png -resize 32x32 -colors 16 \\( -clone 0 -resize 16x16 -extent 16x16 \\) \\( -clone 0 -resize 32x32 -extent 32x32 \\) -delete 0 static/favicon.ico", "svgo": "svgo */**.svg", "deploy": "docker-compose up -d --build", - "stats": "./themes/hugo-theme-lowtech/scripts/stats.sh", "ftp-deploy": "lftp -u $HISTOIREDUNPIED_FTP_USER,$HISTOIREDUNPIED_FTP_PASSWORD $HISTOIREDUNPIED_FTP_HOST -e 'mirror -e -R ./public /www ; quit'", "ftp-htaccess": "lftp -u $HISTOIREDUNPIED_FTP_USER,$HISTOIREDUNPIED_FTP_PASSWORD $HISTOIREDUNPIED_FTP_HOST -e 'put ./.htaccess ; quit'", "test": "echo \"Error: no test specified\" && exit 1" diff --git a/themes/hugo-theme-lowtech b/themes/hugo-theme-lowtech index 090aac0..70e86df 160000 --- a/themes/hugo-theme-lowtech +++ b/themes/hugo-theme-lowtech @@ -1 +1 @@ -Subproject commit 090aac090068bc018ef3673645e9fc98eee90f6b +Subproject commit 70e86dfd2359eaffbb2eec896a485c930355f42d