From 63c5d54a2ecb487abecb7c25532f915751355449 Mon Sep 17 00:00:00 2001 From: SolAZDev Date: Tue, 16 Jan 2024 15:40:29 -0400 Subject: [PATCH] corrected directory references --- conf/motioneye.conf | 6 +++--- conf/systemd.service | 4 ++-- manifest.toml | 5 +++-- scripts/install | 4 ++++ scripts/restore | 4 ++++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/conf/motioneye.conf b/conf/motioneye.conf index 6de7657..962c0ba 100644 --- a/conf/motioneye.conf +++ b/conf/motioneye.conf @@ -1,11 +1,11 @@ # path to the configuration directory (must be writable by motionEye) -conf_path /var/www/__APP__ +conf_path __INSTALL_DIR__ # path to the directory where pid files go (must be writable by motionEye) -run_path /var/www/__APP__/run +run_path __INSTALL_DIR__/run # path to the directory where log files go (must be writable by motionEye) -log_path __DATA_DIR__/logs +log_path __INSTALL_DIR__/logs # default output path for media files (must be writable by motionEye) media_path __DATA_DIR__/media diff --git a/conf/systemd.service b/conf/systemd.service index 12df2e8..b6eb9e6 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,8 +7,8 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/venv -ExecStart=__INSTALL_DIR__/venv/bin/meyectl startserver -c /var/www/__APP__/motioneye.conf -StandardOutput=append:/var/log/__APP__/__APP__.log +ExecStart=__INSTALL_DIR__/venv/bin/meyectl startserver -c __INSTALL_DIR__/motioneye.conf +StandardOutput=append:__INSTALL_DIR__/__APP__.log StandardError=inherit Restart=on-abort diff --git a/manifest.toml b/manifest.toml index 10675ec..9a85e5a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ multi_instance = true ldap = false sso = true disk = "500M" -ram.build = "256M" +ram.build = "512M" ram.runtime = "1024M" [install] @@ -54,13 +54,14 @@ ram.runtime = "1024M" sha256 = "4eb191029a142f11f4c30cf558e2552ea4b9d659aee54cb65a5e7e4f6f56bd11" extract = false rename = "source.tar.gz" + # autoupdate.strategy = "latest_github_release" [resources.system_user] [resources.install_dir] [resources.data_dir] - subdirs = ["logs", "media"] + subdirs = ["media"] [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index b73ff4e..9e1ad07 100755 --- a/scripts/install +++ b/scripts/install @@ -60,6 +60,10 @@ popd mkdir -p $install_dir/run chown $app:$app $install_dir/run chmod 664 $install_dir/run +# logs dir +mkdir -p $install_dir/logs +chown $app:$app $install_dir/logs +chmod 664 $install_dir/logs #================================================= # APP INITIAL CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 521c371..f3de53d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -29,6 +29,10 @@ popd mkdir -p $install_dir/run chown $app:$app $install_dir/run chmod 664 $install_dir/run +# logs dir +mkdir -p $install_dir/logs +chown $app:$app $install_dir/logs +chmod 664 $install_dir/logs #================================================= # RESTORE THE DATA DIRECTORY