Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
42b0a5f0
Commit
42b0a5f0
authored
May 19, 2022
by
HongzheWang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/lamp:add modifiable db-information
parent
d81bc08e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+7
-0
stack/lamp/buildout.hash.cfg
stack/lamp/buildout.hash.cfg
+2
-2
stack/lamp/instance-lamp.cfg.jinja2.in
stack/lamp/instance-lamp.cfg.jinja2.in
+4
-4
stack/lamp/instance.cfg.in
stack/lamp/instance.cfg.in
+3
-0
No files found.
stack/lamp/buildout.cfg
View file @
42b0a5f0
...
...
@@ -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
...
...
stack/lamp/buildout.hash.cfg
View file @
42b0a5f0
...
...
@@ -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
...
...
stack/lamp/instance-lamp.cfg.jinja2.in
View file @
42b0a5f0
...
...
@@ -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
stack/lamp/instance.cfg.in
View file @
42b0a5f0
...
...
@@ -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 }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment