From 6b367f34a9686e7cdabbd24530119f099e9e32ca Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 21 Nov 2022 08:16:30 +0000 Subject: [PATCH] wip #5590 @0.5 --- .docker/config/{ => cron}/crontab | 6 +----- .docker/config/cron/host | 3 +++ .docker/docker-compose.yml | 5 ++++- .docker/update | 6 ++---- bin/fixrights | 17 ++++++++++++----- bin/removeworkingdupes | 2 ++ 6 files changed, 24 insertions(+), 15 deletions(-) rename .docker/config/{ => cron}/crontab (78%) create mode 100644 .docker/config/cron/host create mode 100644 bin/removeworkingdupes diff --git a/.docker/config/crontab b/.docker/config/cron/crontab similarity index 78% rename from .docker/config/crontab rename to .docker/config/cron/crontab index 7018b2194..f10bb874d 100644 --- a/.docker/config/crontab +++ b/.docker/config/cron/crontab @@ -2,15 +2,11 @@ MAILTO=sysadmin@cubedesigners.com SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -#10 * * * * stats /data1/stats/www/FWStats.sh /data1/stats/www 1000000 - 20 * * * * root lynx --dump https://workshop.fluidbook.com/maintenance/cleanDownload >/dev/null 2>/dev/null 0 2 * * * root lynx --dump https://workshop.fluidbook.com/maintenance/deleteOldFilesFromFTP >/dev/null 2>/dev/null 0 5 * * * root lynx --dump https://workshop.fluidbook.com/maintenance/cleanCompiledBooks >/dev/null 2>/dev/null 40 * * * * root lynx --dump https://workshop.fluidbook.com/maintenance/cleanPackages >/dev/null 2>/dev/null 0 1 * * * root lynx --dump https://workshop.fluidbook.com/maintenance/cleanConversionSessions >/dev/null 2>/dev/null - -24 4 * * * root /application/bin/fixrights >/dev/null 2>/dev/null -*/5 * * * * root /application/bin/fixpackagerrights >/dev/null 2>/dev/null +*/5 * * * * root /application/bin/fixpackagerrights >/dev/null 2>/dev/null 35 3 * * * root /application/bin/compresslogs >/dev/null 2>/dev/null 10 * * * * root /application/bin/cleantmp >/dev/null 2>/dev/null diff --git a/.docker/config/cron/host b/.docker/config/cron/host new file mode 100644 index 000000000..8cecb8215 --- /dev/null +++ b/.docker/config/cron/host @@ -0,0 +1,3 @@ +0 23 5 * * root /home/extranet/www/bin/removeworkingdupes > /var/log/removeworkingdupes.log 2>&1 +3 3 * * * root /docker/extranet/build >/dev/null 2>/dev/null +24 4 * * * root /home/extranet/www/bin/fixrights >/dev/null 2>/dev/null diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 4e5a220a9..00946d7a1 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -27,6 +27,7 @@ services: - '/mnt/sshfs/codesign:/mnt/sshfs/codesign' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' + - '/home/stats/www:/home/stats/www' # Config - '/home/extranet/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' ports: @@ -65,6 +66,7 @@ services: - '/mnt/sshfs/codesign:/mnt/sshfs/codesign' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' + - '/home/stats/www:/home/stats/www' # Config - '/home/extranet/www/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf' ports: @@ -107,7 +109,7 @@ services: - '/home/extranet/www/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini' - '/home/extranet/sessions/:/var/lib/php/sessions/' # Crontab - - '/home/extranet/www/.docker/config/crontab:/etc/crontab' + - '/home/extranet/www/.docker/config/cron/crontab:/etc/crontab' # Files - '/data/extranet/ftp:/ftp' - '/home/extranet/fonts/:/fonts/' @@ -130,6 +132,7 @@ services: - '/mnt/sshfs/codesign:/mnt/sshfs/codesign' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' + - '/home/stats/www:/home/stats/www' tmpfs: #- '/tmp:mode=777,uid=1002,gid=33' - '/var/log/extranet:uid=1002,gid=33' diff --git a/.docker/update b/.docker/update index 48d2d518d..745869b77 100644 --- a/.docker/update +++ b/.docker/update @@ -1,10 +1,8 @@ #!/bin/sh cd /docker/extranet -chown -R extranet:www-data /home/extranet -chown -R extranet:www-data /data/extranet -chmod -R 774 /home/extranet/www/fluidbook/themes3 -chmod -R 777 /home/extranet/share +chown root:root /home/extranet/www/.docker/config/cron/host;ln -sf /home/extranet/www/.docker/config/cron/host /etc/cron.d/extranet docker network create extranet ./build docker compose down docker compose up -d +/home/extranet/www/bin/fixrights \ No newline at end of file diff --git a/bin/fixrights b/bin/fixrights index 2c4f369e8..2788f919b 100644 --- a/bin/fixrights +++ b/bin/fixrights @@ -1,7 +1,14 @@ #!/bin/bash -chmod -R 775 /application +chown -R extranet:www-data /home/extranet +chown root:root /home/extranet/www/.docker/config/cron/host +chown root:root /home/extranet/www/.docker/config/sudoers +chown -R extranet:www-data /data/extranet +chmod -R 775 /home/extranet +chmod -R 775 /data/extranet +chmod -R 777 /home/extranet/share chmod -R 777 /application/fluidbook/compile/player -chmod 600 /application/.ssh/id_rsa -chmod 700 /application/.ssh -chmod 600 /application/.ssh/authorized_keys2 -chown -R extranet:www-data /application +chmod 600 /home/extranet/www/.docker/config/ssh/id_rsa +chmod 700 /home/extranet/www/.docker/config/ssh/ +chmod 600 /home/extranet/www/.docker/config/ssh/authorized_keys2 +chown root:root /home/extranet/www/.docker/config/cron/host +chown root:root /home/extranet/www/.docker/config/sudoers \ No newline at end of file diff --git a/bin/removeworkingdupes b/bin/removeworkingdupes new file mode 100644 index 000000000..a9dd44f0c --- /dev/null +++ b/bin/removeworkingdupes @@ -0,0 +1,2 @@ +#!/bin/sh +docker run -it --init -v /data/extranet/www/fluidbook/books/working/:/data ghcr.io/jbruchon/jdupes:latest -l -r /data \ No newline at end of file -- 2.39.5