diff --git a/PKGBUILD b/PKGBUILD index e20c87d..d4868df 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,12 +14,12 @@ makedepends=("git") optdepends=("postgresql: database") backup=("etc/${pkgname%-git}.env") source=( - "${pkgname}::git+ssh://gitea@git.edgarpierre.fr:39529/edpibu/nummi.git" + "${pkgname}::git+https://git.edgarpierre.fr/edpibu/nummi" "${pkgname%-git}.service" "${pkgname%-git}.tmpfiles" "${pkgname%-git}.sysusers" "${pkgname%-git}.nginx" - "${pkgname%-git}.env" + "config.toml" ) b2sums=('SKIP' '9e9b62a141bb4594dc203978d5c56dd397ed6c095e6f83fdea07ded2fa46dd2e052aa8f80729a3b612e3773aa487660fcca791079ad4885b825c9c831df61b45' @@ -38,7 +38,7 @@ package() { install -Dm644 ${pkgname%-git}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname%-git}.conf install -Dm644 ${pkgname%-git}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname%-git}.conf install -Dm644 ${pkgname%-git}.nginx "${pkgdir}"/etc/nginx/sites-enabled/${pkgname%-git}.conf - install -Dm750 ${pkgname%-git}.env -t "${pkgdir}"/etc/ + install -Dm750 config.toml -t "${pkgdir}"/etc/${pkgname%-git}/ cd ${pkgname}/${pkgname%-git} find * -type f -exec install -Dm0644 "{}" "${pkgdir}/usr/share/webapps/${pkgname%-git}/{}" \; diff --git a/nummi.service b/nummi.service index d61fc56..2d95c3a 100644 --- a/nummi.service +++ b/nummi.service @@ -8,7 +8,7 @@ User=nummi Group=nummi RuntimeDirectory=nummi WorkingDirectory=/usr/share/webapps/nummi -EnvironmentFile=/etc/nummi.env +Environment=NUMMI_CONFIG=/etc/nummi/config.toml ExecStartPre=/usr/bin/python manage.py migrate ExecStartPre=/usr/bin/python manage.py collectstatic --noinput ExecStart=/usr/bin/uvicorn nummi.asgi:application --uds /run/nummi/nummi.socket