Fix permissions on mastodon.conf

dhelonious · Sep 16, 2024 · 805a228 · 805a228
1 parent 09e39df
commit 805a228
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/snap/hooks/configure b/snap/hooks/configure
@@ -43,7 +43,7 @@ if [ "$BACKUP_DIR" != "$CURRENT_BACKUP_DIR" ]; then
     update_backup_dir_file
 fi
 
-if $(mastodon_config_exists); then
+if mastodon_config_exists; then
     # TODO: remove later, required for upgrade to Mastodon 4.3+
     if [ -z "$ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY" ] \
     || [ -z "$ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY" ] \

diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
@@ -62,17 +62,19 @@ copy_config_as_daemon_user redis redis.conf
 # NOTE: This is a fix for older versions and may be removed in the future
 echo Set permissions on mastodon files and dirs
 fix_daemon_user "$SNAP_DATA/mastodon"
-fix_daemon_user "$SNAP_COMMON/mastodon.conf"
 fix_daemon_user "$MEDIA_DIR"
 fix_daemon_user "$LOG_DIR/backend.log"
 fix_daemon_user "$LOG_DIR/streaming.log"
 fix_daemon_user "$LOG_DIR/sidekiq.log"
+if mastodon_config_exists; then
+    chmod 664 "$SNAP_COMMON/mastodon.conf"
+fi
 
 if [ "$SNAP_VERSION" != "$CURRENT_SNAP_VERSION" ]; then
     echo Update mastodon
     update_mastodon_files
 
-    if $(mastodon_config_exists); then
+    if mastodon_config_exists; then
         echo Update mastodon config
         link_mastodon_config
         upgrade_mastodon_config

diff --git a/src/mastodon/bin/setup b/src/mastodon/bin/setup
@@ -6,7 +6,7 @@
 
 check_root
 
-if $(mastodon_config_exists); then
+if mastodon_config_exists; then
     echo_error "Mastodon is already set up"
     exit 0
 fi

diff --git a/src/mastodon/mastodon.env b/src/mastodon/mastodon.env
@@ -50,13 +50,13 @@ mastodon_config_exists() {
 }
 
 mastodon_get_var() {
-    if $(mastodon_config_exists); then
+    if mastodon_config_exists; then
         sed -rn "s,^.*$1=([^ ]*|'[^']*'|"'"[^"]*"'").*$,\1,p" "$SNAP_COMMON/mastodon.conf"
     fi
 }
 
 mastodon_set_var() {
-    if $(mastodon_config_exists); then
+    if mastodon_config_exists; then
         if grep -qF "$1=" "$SNAP_COMMON/mastodon.conf"; then
             $SNAP/bin/sed_inline "s,$1=([^ ]*|'[^']*'|"'"[^"]*"'"),$1=$2," "$SNAP_COMMON/mastodon.conf"
         else
@@ -104,7 +104,7 @@ mastodon_tootctl() {
 }
 
 check_setup() {
-    if ! $(mastodon_config_exists); then
+    if ! mastodon_config_exists; then
         echo "Mastodon is not yet set up"
         exit 0
     fi