summaryrefslogtreecommitdiff
diff options
authorAndrew Dolgov <[email protected]>2025-07-12 14:35:03 +0300
committerAndrew Dolgov <[email protected]>2025-07-12 14:35:03 +0300
commitdea3f2dcb2badccd683296dfc74cfcf506c3a7da (patch)
treef6dd364cf532f54221a1425420cfb3c58b77a52d
parentd3599707ac8ab4327b15805375628a8238583b73 (diff)
parentd9e2cd44ceca5ebbf4a5f4706865a5aae22ef19a (diff)
Merge branch 'no-more-666' into 'master'HEADmaster
set sane permissions on cache/lockfiles/feed-icons instead of hardcoding a+rwx See merge request tt-rss/tt-rss!165
-rw-r--r--.docker/app/startup.sh5
-rw-r--r--.docker/app/update.sh4
2 files changed, 4 insertions, 5 deletions
diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh
index dbe6331b9..1174e8fae 100644
--- a/.docker/app/startup.sh
+++ b/.docker/app/startup.sh
@@ -65,10 +65,9 @@ done
# - fatal error: could not open certificate file "/root/.postgresql/postgresql.crt": Permission denied
chown -R app:app /root # /.postgresql
-# TODO chown -R app:app should be enough (?)
for d in cache lock feed-icons; do
- chmod 777 $DST_DIR/$d
- find $DST_DIR/$d -type f -exec chmod 666 {} \;
+ chown -R app:app $DST_DIR/$d
+ chmod -R u=rwX,g=rX,o=rX $DST_DIR/$d
done
sudo -u app cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php
diff --git a/.docker/app/update.sh b/.docker/app/update.sh
index 366b600a0..e383091d1 100644
--- a/.docker/app/update.sh
+++ b/.docker/app/update.sh
@@ -55,8 +55,8 @@ done
chown -R app:app /root # /.postgresql
for d in cache lock feed-icons; do
- chmod 777 $DST_DIR/$d
- find $DST_DIR/$d -type f -exec chmod 666 {} \;
+ chown -R app:app $DST_DIR/$d
+ chmod -R u=rwX,g=rX,o=rX $DST_DIR/$d
done
sudo -u app cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php
close