diff --git a/conf/config.toml b/conf/config.toml index ef6f54c..e9cdb77 100644 --- a/conf/config.toml +++ b/conf/config.toml @@ -1,7 +1,7 @@ [main] log_level = "info" secret_key = "__KEY__" -data_directory = "data" +data_directory = "__DATA_DIR__" [server] host = "127.0.0.1" diff --git a/conf/systemd.service b/conf/systemd.service index 4610db4..6f1766a 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -ExecStart=__INSTALL_DIR__/readeck serve -config __INSTALL_DIR__/config.toml +ExecStart=__INSTALL_DIR__/readeck serve -config __DATA_DIR__/config.toml Restart=on-failure RestartSec=5 diff --git a/manifest.toml b/manifest.toml index 0c7cbad..9f3b4b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,7 +46,7 @@ ram.runtime = "50M" amd64.url = "https://codeberg.org/readeck/readeck/releases/download/0.12.0/readeck-0.12.0-linux-amd64" amd64.sha256 = "c2387688f4603a65e77f20042afd76191551ff2d6abe56117a82fb759837fa67" arm64.url = "https://codeberg.org/readeck/readeck/releases/download/0.12.0/readeck-0.12.0-linux-arm64" - arm.sha256 = "1ee30dc8ab6478d4ba1c1f179d4381cdac4e7e7dc2f7071f945374823fdab72e" + arm64.sha256 = "1ee30dc8ab6478d4ba1c1f179d4381cdac4e7e7dc2f7071f945374823fdab72e" armhf.url = "https://codeberg.org/readeck/readeck/releases/download/0.12.0/readeck-0.12.0-linux-arm-6" armhf.sha256 = "62b33fbe63726ac59d4242ec8b6bb31641d09246274e83a5d3989be57d46c478" rename = "readeck" diff --git a/scripts/backup b/scripts/backup index 9b0047c..1091cef 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/change_url b/scripts/change_url index 1677095..7e56cec 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,7 +23,6 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -# this will most likely adjust NGINX config correctly ynh_change_url_nginx_config #================================================= @@ -31,10 +30,10 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="config.toml" --destination="$install_dir/config.toml" +ynh_add_config --template="config.toml" --destination="$data_dir/config.toml" -chmod 600 "$install_dir/config.toml" -chown "$app:$app" "$install_dir/config.toml" +chmod 600 "$data_dir/config.toml" +chown "$app:$app" "$data_dir/config.toml" #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index cf1dec1..a351681 100755 --- a/scripts/install +++ b/scripts/install @@ -46,10 +46,10 @@ yunohost service add "$app" --description="Bookmark manager and a read later too #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="config.toml" --destination="$install_dir/config.toml" +ynh_add_config --template="config.toml" --destination="$data_dir/config.toml" -chmod 600 "$install_dir/config.toml" -chown "$app:$app" "$install_dir/config.toml" +chmod 600 "$data_dir/config.toml" +chown "$app:$app" "$data_dir/config.toml" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index f5b41cd..08eb52e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,10 +47,10 @@ yunohost service add "$app" --description="Bookmark manager and a read later too #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template="config.toml" --destination="$data_dir/config.toml" +#ynh_add_config --template="config.toml" --destination="$data_dir_dir/config.toml" -chmod 400 "$data_dir/config.toml" -chown "$app:$app" "$data_dir/config.toml" +#chmod 600 "$data_dir_dir/config.toml" +#chown "$app:$app" "$data_dir_dir/config.toml" #================================================= # START SYSTEMD SERVICE