diff --git a/bundles/freescout/items.py b/bundles/freescout/items.py index 1b71f53..8661d8b 100644 --- a/bundles/freescout/items.py +++ b/bundles/freescout/items.py @@ -41,15 +41,15 @@ actions = { }, } -files = { - '/opt/freescout/.env': { - 'content': '\n'.join( - f'{k}={v}' for k, v in - sorted(node.metadata.get('freescout/env').items()) - ), - 'needs': [ - 'directory:/opt/freescout', - 'action:clone_freescout', - ], - }, -} +# files = { +# '/opt/freescout/.env': { +# 'content': '\n'.join( +# f'{k}={v}' for k, v in +# sorted(node.metadata.get('freescout/env').items()) +# ), +# 'needs': [ +# 'directory:/opt/freescout', +# 'action:clone_freescout', +# ], +# }, +# } diff --git a/bundles/freescout/metadata.py b/bundles/freescout/metadata.py index 3a803f6..8679a54 100644 --- a/bundles/freescout/metadata.py +++ b/bundles/freescout/metadata.py @@ -16,18 +16,18 @@ defaults = { 'php-intl': {}, }, }, - 'freescout': { - 'env': { - 'APP_TIMEZONE': 'Europe/Berlin', - 'DB_CONNECTION': 'pgsql', - 'DB_HOST': '127.0.0.1', - 'DB_PORT': '5432', - 'DB_DATABASE': 'freescout', - 'DB_USERNAME': 'freescout', - 'DB_PASSWORD': database_password, - 'APP_KEY': 'base64:' + repo.vault.random_bytes_as_base64_for(f'{node.name} freescout APP_KEY', length=32).value - }, - }, + # 'freescout': { + # 'env': { + # 'APP_TIMEZONE': 'Europe/Berlin', + # 'DB_CONNECTION': 'pgsql', + # 'DB_HOST': '127.0.0.1', + # 'DB_PORT': '5432', + # 'DB_DATABASE': 'freescout', + # 'DB_USERNAME': 'freescout', + # 'DB_PASSWORD': database_password, + # 'APP_KEY': 'base64:' + repo.vault.random_bytes_as_base64_for(f'{node.name} freescout APP_KEY', length=32).value + # }, + # }, 'php': { 'php.ini': { 'cgi': { @@ -57,17 +57,17 @@ defaults = { } -@metadata_reactor.provides( - 'freescout/env/APP_URL', -) -def freescout(metadata): - return { - 'freescout': { - 'env': { - 'APP_URL': 'https://' + metadata.get('freescout/domain') + '/', - }, - }, - } +# @metadata_reactor.provides( +# 'freescout/env/APP_URL', +# ) +# def freescout(metadata): +# return { +# 'freescout': { +# 'env': { +# 'APP_URL': 'https://' + metadata.get('freescout/domain') + '/', +# }, +# }, +# } @metadata_reactor.provides( diff --git a/bundles/wordpress/metadata.py b/bundles/wordpress/metadata.py index 33a4e11..7df60e4 100644 --- a/bundles/wordpress/metadata.py +++ b/bundles/wordpress/metadata.py @@ -1,4 +1,12 @@ -defaults = {} +defaults = { + 'php': { + 'php.ini': { + 'cgi': { + 'fix_pathinfo': '0', + }, + }, + }, +} @metadata_reactor.provides(