diff --git a/bundles/gitea/items.py b/bundles/gitea/items.py index 45023fb..3819d77 100644 --- a/bundles/gitea/items.py +++ b/bundles/gitea/items.py @@ -2,7 +2,7 @@ version = version=node.metadata.get('gitea/version') downloads['/usr/local/bin/gitea'] = { 'url': f'https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-amd64', - 'sha256': node.metadataget('gitea/sha256'), + 'sha256': node.metadata.get('gitea/sha256'), 'triggers': { 'svc_systemd:gitea:restart', }, diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py index 3aa21e9..d560952 100644 --- a/bundles/gitea/metadata.py +++ b/bundles/gitea/metadata.py @@ -1,22 +1,24 @@ +database_password = repo.vault.password_for(f'{node.name} postgresql gitea') + defaults = { 'gitea': { 'database': { 'host': 'localhost', 'port': '5432', 'username': 'gitea', - 'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)), + 'password': database_password, 'database': 'gitea', }, 'app_name': 'Gitea', - 'lfs_secret_key': repo.vault.password_for('{} gitea lfs_secret_key'.format(node.name)), - 'security_secret_key': repo.vault.password_for('{} gitea security_secret_key'.format(node.name)), - 'oauth_secret_key': repo.vault.password_for('{} gitea oauth_secret_key'.format(node.name)), - 'internal_token': repo.vault.password_for('{} gitea internal_token'.format(node.name)), + 'lfs_secret_key': repo.vault.password_for(f'{node.name} gitea lfs_secret_key', length=43), + 'security_secret_key': repo.vault.password_for(f'{node.name} gitea security_secret_key'), + 'oauth_secret_key': repo.vault.password_for(f'{node.name} gitea oauth_secret_key', length=43), + 'internal_token': repo.vault.password_for(f'{node.name} gitea internal_token'), }, 'postgresql': { 'roles': { 'gitea': { - 'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)), + 'password': database_password, }, }, 'databases': {