diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 0b8cbc3..0000000 --- a/conf/app.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.4.tar.gz -SOURCE_SUM=2dafdcf26de6c041611d16ed48b751cf8d4dfbee1f5cf4aa5975592bc080261d -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true \ No newline at end of file diff --git a/conf/bookwyrm-worker.service b/conf/bookwyrm-worker.service index 739c43d..410d418 100644 --- a/conf/bookwyrm-worker.service +++ b/conf/bookwyrm-worker.service @@ -9,7 +9,7 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ EnvironmentFile=__INSTALL_DIR__/.env -ExecStart=__INSTALL_DIR__/venv/bin/celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority +ExecStart=__INSTALL_DIR__/venv/bin/celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,imports NoNewPrivileges=yes PrivateTmp=yes diff --git a/manifest.toml b/manifest.toml index 0d2985b..866fdaf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,21 +14,20 @@ license = "AGPL-3.0-or-later" website = "https://joinbookwyrm.com/fr/" demo = "https://joinbookwyrm.com/fr/" admindoc = "https://docs.joinbookwyrm.com/" -code = "https://github.com/bookwyrm-social/bookwyrm" +code = "https://github.com/bookwyrm-social/bookwyrm" [integration] -yunohost = ">= 11.0.9" -architectures = "all" +yunohost = ">= 11.1.14" +architectures = "all" multi_instance = false -ldap = "not_relevant" -sso = "not_relevant" -disk = "50M" -ram.build = "50M" -ram.runtime = "50M" +ldap = "not_relevant" +sso = "not_relevant" +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" full_domain = true @@ -44,10 +43,15 @@ ram.runtime = "50M" default = "fr-fr" [install.admin] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "user" [resources] + [resources.sources] + + [resources.sources.main] + url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.4.tar.gz" + sha256 = "2dafdcf26de6c041611d16ed48b751cf8d4dfbee1f5cf4aa5975592bc080261d" + [resources.system_user] [resources.install_dir] @@ -64,4 +68,4 @@ ram.runtime = "50M" packages = "postgresql, postgresql-contrib, python3-venv, libpq-dev" [resources.database] - type = "postgresql" \ No newline at end of file + type = "postgresql" diff --git a/scripts/install b/scripts/install index d21888c..873e4e8 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,6 @@ $install_dir/venv/bin/python3 "$install_dir/manage.py" initdb $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input - #================================================= # NGINX CONFIGURATION #=================================================