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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Alain Takoudjou
slapos
Commits
aae0d49c
Commit
aae0d49c
authored
Feb 07, 2022
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5/repman: stop doing extra serialization of odbc.ini content with base64
This was useless. dumps is enough.
parent
d6dd35af
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
24 deletions
+10
-24
software/repman/buildout.hash.cfg
software/repman/buildout.hash.cfg
+2
-2
software/repman/instance-mariadb.cfg.jinja2.in
software/repman/instance-mariadb.cfg.jinja2.in
+3
-9
software/repman/instance.cfg.in
software/repman/instance.cfg.in
+0
-1
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-mariadb.cfg.in
+3
-9
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-1
No files found.
software/repman/buildout.hash.cfg
View file @
aae0d49c
...
...
@@ -14,7 +14,7 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
md5sum =
af2fc4a7a0f782fed2cb1112ef3cb397
md5sum =
1c9c4c254f371337fe08b7922901f8a9
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
...
...
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
[template-mariadb.cfg]
_update_hash_filename_ = instance-mariadb.cfg.jinja2.in
md5sum =
938f1e8087395757f5ae861d20500658
md5sum =
aa25693b324ce5acc00f29b96a2516c0
[template-my-cnf]
_update_hash_filename_ = templates/my.cnf.in
...
...
software/repman/instance-mariadb.cfg.jinja2.in
View file @
aae0d49c
...
...
@@ -214,16 +214,10 @@ wait-for-files =
{{ supervisord_lib.supervisord_program("mariadb", maradb_program_dict) }}
{% do part_list.append("supervisord-mariadb") %}
[odbc-ini-text]
text = {{ dumps(base64.b64encode( slapparameter_dict.get('odbc-ini', '').encode() )) }}
[{{ section('odbc-ini') }}]
< = jinja2-template-base
rendered = ${directory:etc}/odbc.ini
template = inline:{% raw -%}
{{ parameter_dict['text'].decode('base64') }}
{%- endraw %}
context = section parameter_dict odbc-ini-text
recipe = slapos.recipe.template
output = ${directory:etc}/odbc.ini
inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
[{{ section('logrotate-entry-mariadb') }}]
< = logrotate-entry-base
...
...
software/repman/instance.cfg.in
View file @
aae0d49c
...
...
@@ -108,4 +108,3 @@ template = {{ template_mariadb }}
filename = instance-mariadb.cfg
extra-context =
section parameter_dict template-mariadb-parameters
import base64 base64
stack/erp5/buildout.hash.cfg
View file @
aae0d49c
...
...
@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb]
filename = instance-mariadb.cfg.in
md5sum =
4a1e279e3757c964caaa27137fecb66f
md5sum =
2daa3aaa1263705c4628864230049c67
[template-kumofs]
filename = instance-kumofs.cfg.in
...
...
@@ -70,7 +70,7 @@ md5sum = 274365ebbade26558ca4836837e781aa
[template]
filename = instance.cfg.in
md5sum =
ed280a76c22247cf2a05fac29b8a8b30
md5sum =
165b0a50672138ee4a3fbe9239af11ba
[template-erp5]
filename = instance-erp5.cfg.in
...
...
stack/erp5/instance-mariadb.cfg.in
View file @
aae0d49c
...
...
@@ -197,15 +197,9 @@ environ =
[{{ section('odbc-ini') }}]
< = jinja2-template-base
rendered = ${directory:etc}/odbc.ini
template = inline:{% raw -%}
{{ base64.b64decode(text).decode('utf-8') }}
{%- endraw %}
text = {{ dumps(base64.b64encode(slapparameter_dict.get('odbc-ini', '').encode('utf-8'))) }}
context =
key text :text
import base64 base64
recipe = slapos.recipe.template
output = ${directory:etc}/odbc.ini
inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
[{{ section('logrotate-entry-mariadb') }}]
< = logrotate-entry-base
...
...
stack/erp5/instance.cfg.in
View file @
aae0d49c
...
...
@@ -178,7 +178,6 @@ template = {{ template_mariadb }}
filename = instance-mariadb.cfg
extra-context =
section parameter_dict dynamic-template-mariadb-parameters
import base64 base64
# Keep a section for backward compatibility for removed types
# Once the section is removed, ghost instances will keep failing until
...
...
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