nomad
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup

This commit is contained in:
Daniel Berteaud 2024-03-02 22:19:51 +01:00
parent 97afa76691
commit 1a79483efc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/lemonldap-ng.nomad.hcl
View File

@ -157,8 +157,6 @@ job "lemonldap-ng" {
LLNG_MANAGER_VHOST = "manager.example.org"
LLNG_PORTAL_VHOST = "sso.example.org"
LLNG_CUSTOM_ASSETS_DIR = "/local/assets"
}
# Use a template block instead of env {} so we can fetch values from vault

9
lemonldap-ng.nomad.hcl
View File

@ -64,10 +64,9 @@ job "[[ .instance ]]" {
LLNG_MANAGER_VHOST = [[ (urlParse .llng.manager.public_url).Hostname | toJSON ]]
LLNG_PORTAL_VHOST = [[ (urlParse .llng.portal.public_url).Hostname | toJSON ]]
LLNG_CUSTOM_ASSETS_DIR = "/local/assets"
[[ template "common/proxy_env" $c ]]
}
[[ template "common/file_env" $c.env ]]
[[ template "common/file_env" $c ]]
# Main Lemonldap::NG configuration
template {
@ -116,10 +115,10 @@ _EOT
# A small script to handle initialization (create tables, indexes, load initial config in the DB)
template {
data = <<_EOT
[[ template "lemonldap-ng/init.sh.tpl" . ]]
[[ template "lemonldap-ng/init.sh.tpl" $c ]]
_EOT
destination = "local/init-db.sh"
perms = 755
perms = 755
}
# Custom file based config, which will be migrated to the database
@ -138,7 +137,7 @@ _EOT
destination = "local/minit.d/lemonldap-ng.yml"
}
[[ template "common/resources" $c.resources ]]
[[ template "common/resources" $c ]]
}
}
}