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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos
Commits
a85ff7b1
Commit
a85ff7b1
authored
1 month ago
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{software,stack}/caucase: Add support for --backup-period
parent
caedeaf8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
3 deletions
+14
-3
software/caucase/buildout.hash.cfg
software/caucase/buildout.hash.cfg
+1
-1
software/caucase/instance-caucase-input-schema.json
software/caucase/instance-caucase-input-schema.json
+6
-0
software/caucase/instance-caucased.cfg.jinja2
software/caucase/instance-caucased.cfg.jinja2
+4
-0
stack/caucase/buildout.hash.cfg
stack/caucase/buildout.hash.cfg
+1
-1
stack/caucase/caucase.jinja2.library
stack/caucase/caucase.jinja2.library
+2
-1
No files found.
software/caucase/buildout.hash.cfg
View file @
a85ff7b1
...
...
@@ -15,7 +15,7 @@
# not need these here).
[instance-caucased]
filename = instance-caucased.cfg.jinja2
md5sum =
9a9241dc87c9bda91ab2958bf874240a
md5sum =
361eea7fa660f550fd63afa53689142f
[instance]
filename = instance.cfg.jinja2
...
...
This diff is collapsed.
Click to expand it.
software/caucase/instance-caucase-input-schema.json
View file @
a85ff7b1
...
...
@@ -31,6 +31,12 @@
"type"
:
"integer"
,
"default"
:
1
},
"backup-period"
:
{
"title"
:
"Backup period"
,
"description"
:
"Number of days between consecutive backups (0 to disable backup creation)."
,
"type"
:
"number"
,
"default"
:
0
},
"key-length"
:
{
"title"
:
"Key length"
,
"description"
:
"Size, in bits, of the SSL CAs (users and services) private keys generated by caucased."
,
...
...
This diff is collapsed.
Click to expand it.
software/caucase/instance-caucased.cfg.jinja2
View file @
a85ff7b1
...
...
@@ -2,12 +2,14 @@
{% set bind = (ipv6_set | list)[0] -%}
{% set base_port = slapparameter_dict.get('base-port', 8009) -%}
{% set default_netloc = '[' ~ bind ~ ']:' ~ base_port -%}
{% set backup_period = slapparameter_dict.get('backup-period', 0) -%}
[directory]
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
service-on-watch = ${:etc}/service
srv = ${buildout:directory}/srv
srv-backup-caucased = ${:srv}/backup/caucased
tmp = ${buildout:directory}/tmp
{{ caucase.caucased(
...
...
@@ -22,6 +24,8 @@ tmp = ${buildout:directory}/tmp
key_len=slapparameter_dict.get('key-length', 2048),
bind=bind,
base_port=base_port,
backup_dir='${directory:srv-backup-caucased}' if backup_period else None,
backup_period=backup_period,
) }}
[publish]
...
...
This diff is collapsed.
Click to expand it.
stack/caucase/buildout.hash.cfg
View file @
a85ff7b1
...
...
@@ -15,4 +15,4 @@
[caucase-jinja2-library]
filename = caucase.jinja2.library
md5sum =
11807649cec3fad190e79a7e80aa6a0e
md5sum =
82c3d836b69aeb39fd4d232745c53da0
This diff is collapsed.
Click to expand it.
stack/caucase/caucase.jinja2.library
View file @
a85ff7b1
...
...
@@ -9,6 +9,7 @@
user_auto_approve_count=1,
key_len=None,
backup_dir=None,
backup_period=None,
bind=None,
base_port=None,
promise=True
...
...
@@ -33,7 +34,7 @@ command-line = '{{ buildout_bin_directory }}/caucased'
{% if bind != None %}--bind '{{ bind }}' {%- endif %}
{% if base_port != None %}--base-port '{{ base_port }}' {%- endif %}
{% if key_len %}--key-len '{{ key_len }}' {%- endif %}
{% if backup_dir %}--backup-directory
{{ backup_dir }}
{%- endif %}
{% if backup_dir %}--backup-directory
'{{ backup_dir }}' {% if backup_period != None %}--backup-period '{{ float(backup_period) }}' {%- endif %}
{%- endif %}
--service-auto-approve-count '{{ service_auto_approve_count }}'
--user-auto-approve-count '{{ user_auto_approve_count }}'
--lock-auto-approve-count
...
...
This diff is collapsed.
Click to expand it.
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