diff --git a/dockerfiles/setup.sh b/dockerfiles/setup.sh index 96dcaa47..4ee486c3 100755 --- a/dockerfiles/setup.sh +++ b/dockerfiles/setup.sh @@ -93,10 +93,12 @@ fi # Create an empty log files # Create the execution_queue.log and app_front.log files if they don't exist touch "${INSTALL_DIR}"/front/log/{app.log,execution_queue.log,app_front.log,app.php_errors.log,stderr.log,stdout.log,db_is_locked.log} -touch "${INSTALL_DIR}"/front/api/{user_notifications.json} +touch "${INSTALL_DIR}"/front/api/user_notifications.json echo "[INSTALL] Fixing permissions after copied starter config & DB" chown -R nginx:www-data "${INSTALL_DIR}"/{config,front/log,db,front/api} +chown -R nginx:www-data "${INSTALL_DIR}"/front/api/user_notifications.json + chmod 750 "${INSTALL_DIR}"/{config,front/log,db} find "${INSTALL_DIR}"/{config,front/log,db} -type f -exec chmod 640 {} \; diff --git a/server/plugin.py b/server/plugin.py index 7728f1bf..af63a469 100755 --- a/server/plugin.py +++ b/server/plugin.py @@ -15,8 +15,6 @@ from helper import timeNowTZ, updateState, get_file_content, write_file, get_se from api import update_api from plugin_utils import logEventStatusCounts, get_plugin_string, get_plugin_setting_obj, print_plugin_info, list_to_csv, combine_plugin_objects, resolve_wildcards_arr, handle_empty, custom_plugin_decoder, decode_and_rename_files from notification import Notification_obj -from cryptography import decrypt_data - #------------------------------------------------------------------------------- class plugin_param: diff --git a/server/plugin_utils.py b/server/plugin_utils.py index 836a16fd..2ad0e393 100755 --- a/server/plugin_utils.py +++ b/server/plugin_utils.py @@ -5,6 +5,7 @@ import conf from logger import mylog from const import pluginsPath, logPath, apiPath from helper import timeNowTZ, updateState, get_file_content, write_file, get_setting, get_setting_value +from cryptography import decrypt_data module_name = 'Plugin utils'