diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index 8f429d703e8ca6c604beaf2fafbde431aa2979aa..6b96a315d07a27116047ff5cbe6d9ec113f3a480 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -53,6 +53,10 @@ part = python3 # See software/maarch/software.cfg for an example. path = part-list = +# database information +db-name = lamp +db-user = lamp +db-password = insecure #---------------- #-- Instance-level buildout profiles. @@ -100,6 +104,9 @@ context = key unixodbc_location unixodbc:location key openssl_location openssl:location key custom_application_template custom-application-deployment:path + key db_name custom-application-deployment:db-name + key db_user custom-application-deployment:db-user + key db_password custom-application-deployment:db-password [instance-apache-php] <= template-download-base diff --git a/stack/lamp/buildout.hash.cfg b/stack/lamp/buildout.hash.cfg index b63af307d139fb9e6075c442e162106d70d6da34..641551395c2760be5586a6b0a6b14aa9b860dcf9 100644 --- a/stack/lamp/buildout.hash.cfg +++ b/stack/lamp/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [instance] filename = instance.cfg.in -md5sum = 29df0dc24386ecb97dc52c9fb59108c8 +md5sum = 1c80520db055e70f581f48f1c6771bef [instance-apache-php] filename = instance-apache-php.cfg.in @@ -22,7 +22,7 @@ md5sum = 0952ef9f6cb5e259ad5519d2975d2f37 [instance-lamp] filename = instance-lamp.cfg.jinja2.in -md5sum = e0e2e88b6deeb011b998b78e4e468555 +md5sum = b3d68a13d7a7ffcac774f51f02a68359 [template-apache.conf] filename = apache.conf.in diff --git a/stack/lamp/instance-lamp.cfg.jinja2.in b/stack/lamp/instance-lamp.cfg.jinja2.in index 3117f53e746dd0d8e9ce9a9f4f9541838e7e18ca..3e76a12b2e082f30f71530965e902387a0b3e264 100644 --- a/stack/lamp/instance-lamp.cfg.jinja2.in +++ b/stack/lamp/instance-lamp.cfg.jinja2.in @@ -37,8 +37,8 @@ return = {% do publish_dict.__setitem__('backend-url', '${request-apache:connection-backend-url}') -%} {% do monitor_base_url_dict.__setitem__('apache', '${request-apache:connection-monitor-base-url}') -%} +{% do mariadb_dict.__setitem__('database-list', [{'name': db_name, 'user': db_user, 'password': db_password}]) -%} -{% do mariadb_dict.__setitem__('database-list', [{'name': 'nextcloud', 'user': 'nextcloud', 'password': 'insecure'}]) -%} {% do mariadb_dict.__setitem__('test-database-amount', 0) -%} {% do mariadb_dict.__setitem__('tcpv4-port', 2099) -%} {% do mariadb_dict.__setitem__('max-slowqueries-threshold', 1000) -%} @@ -56,7 +56,7 @@ sla-computer_guid = {{ dumps(slapparameter_dict.get('mariadb-computer-guid', '') {% for key, value in mariadb_dict.items() -%} config-{{ key }} = {{ dumps(value) }} {% endfor -%} -return = +return = database-list monitor-base-url @@ -92,7 +92,7 @@ recipe = slapos.cookbook:publish-early [monitor-instance-parameter] monitor-httpd-port = 8060 -cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} +cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} username = admin password = ${publish-early:monitor-password} @@ -120,7 +120,7 @@ parts = # Complete parts with sections {{ part_list | join('\n ') }} - + eggs-directory = {{ eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }} offline = true diff --git a/stack/lamp/instance.cfg.in b/stack/lamp/instance.cfg.in index a8529537370f2ae0f346f8424623af3a5627a41d..4309edfd5ddbbc8424f617df6caf4b2b46e98c04 100644 --- a/stack/lamp/instance.cfg.in +++ b/stack/lamp/instance.cfg.in @@ -49,6 +49,9 @@ url = {{ template_lamp }} filename = template-lamp.cfg extra-context = section parameter_dict dynamic-template-lamp-parameters + raw db_name {{ db_name }} + raw db_user {{ db_user }} + raw db_passwd {{ db_password }} [dynamic-template-apache-php-parameters] application-location = {{ application_location }}