diff --git a/conf/production.yaml b/conf/production.yaml index a980c17..a13fb47 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -80,9 +80,11 @@ redundancy: # size: '10GB' # strategy: 'trending' # Cache trending videos # - -# size: '10GB' -# strategy: 'recently-added' # Cache recently added videos -# minViews: 10 # Having at least x views + size: '1GB' + # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) + min_lifetime: '48 hours' + strategy: 'recently-added' # Cache recently added videos + minViews: 10 # Having at least x views diff --git a/conf/systemd.service b/conf/systemd.service index 0fc291b..8f5be9d 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,8 @@ Environment=NODE_ENV=production Environment=NODE_CONFIG_DIR=__FINALPATH__/config User=__APP__ Group=__APP__ -ExecStart=/bin/sh -c 'PATH=/opt/node_n/bin:$PATH exec npm start' +Environment="PATH=__ENV_PATH__" +ExecStart=/bin/sh -c ' npm start' WorkingDirectory=__FINALPATH__/ StandardOutput=syslog StandardError=syslog diff --git a/scripts/install b/scripts/install index c96d689..ae188e3 100644 --- a/scripts/install +++ b/scripts/install @@ -214,10 +214,13 @@ chown -R "$app":"$app" "$final_path" "$datadir" systemctl reload nginx + + #================================================= # SETUP SYSTEMD #================================================= +ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service" # Create a dedicated systemd config ynh_add_systemd_config systemctl enable "$app" @@ -231,7 +234,7 @@ systemctl start "$app" ( cd "$final_path" sleep 30 - echo $admin_pass | NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production PATH="/opt/node_n/bin:$PATH" npm run reset-password -- -u root + echo $admin_pass | NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production npm run reset-password -- -u root ) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ac4d2c5..1ff822b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,7 +130,7 @@ ynh_secure_remove "$tmpdir" ( cd "$final_path" - yarn install --production --pure-lockfile --silent --cache-folder /var/cache/yarn/ + yarn install --production --pure-lockfile ) @@ -172,7 +172,7 @@ ynh_use_logrotate --non-append #================================================= # SETUP SYSTEMD #================================================= - +ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service" # Create a dedicated systemd config ynh_add_systemd_config