wip #5590 @0.5

diff --git a/.docker/config/cron/crontab b/.docker/config/cron/crontab
new file mode 100644 (file)
index 0000000..f10bb87
--- /dev/null
+++ b/.docker/config/cron/crontab
@@ -0,0 +1,12 @@
+MAILTO=sysadmin@cubedesigners.com
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+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
+*/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 (file)
index 0000000..8cecb82
--- /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\r
+3 3 * * *   root    /docker/extranet/build  >/dev/null 2>/dev/null\r
+24 4 * * *  root    /home/extranet/www/bin/fixrights >/dev/null 2>/dev/null\r

diff --git a/.docker/config/crontab b/.docker/config/crontab
deleted file mode 100644 (file)
index 7018b21..0000000
--- a/.docker/config/crontab
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-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/docker-compose.yml b/.docker/docker-compose.yml
index 4e5a220a9c070b4d4e26a93fd0932e4ad2c486d1..00946d7a1e56cb9920dc9b63018a52fd3aceb095 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -27,6 +27,7 @@ services:
       - '/mnt/sshfs/codesign:/mnt/sshfs/codesign'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/home/stats/www:/home/stats/www'\r
       # Config\r
       - '/home/extranet/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'\r
     ports:\r
@@ -65,6 +66,7 @@ services:
       - '/mnt/sshfs/codesign:/mnt/sshfs/codesign'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/home/stats/www:/home/stats/www'\r
       # Config\r
       - '/home/extranet/www/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf'\r
     ports:\r
@@ -107,7 +109,7 @@ services:
       - '/home/extranet/www/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini'\r
       - '/home/extranet/sessions/:/var/lib/php/sessions/'\r
       # Crontab\r
-      - '/home/extranet/www/.docker/config/crontab:/etc/crontab'\r
+      - '/home/extranet/www/.docker/config/cron/crontab:/etc/crontab'\r
       # Files\r
       - '/data/extranet/ftp:/ftp'\r
       - '/home/extranet/fonts/:/fonts/'\r
@@ -130,6 +132,7 @@ services:
       - '/mnt/sshfs/codesign:/mnt/sshfs/codesign'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/home/stats/www:/home/stats/www'\r
     tmpfs:\r
       #- '/tmp:mode=777,uid=1002,gid=33'\r
       - '/var/log/extranet:uid=1002,gid=33'\r

diff --git a/.docker/update b/.docker/update
index 48d2d518df4f2f1557198dd5a05839bb92bb9f71..745869b77dcf068213254954856c4e5995123936 100644 (file)
--- 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 2c4f369e8b3e2f73358c3f37df0737ab653e9b8f..2788f919bc13cb2f523400cbe2ad2ca6f667e2d8 100644 (file)
--- 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 (file)
index 0000000..a9dd44f
--- /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