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
Kasra Jamshidi
slapos
Commits
d1607b52
Commit
d1607b52
authored
Feb 26, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable explicit parameter publication in resilient stack.
So that we publish ony once, not twice.
parent
087da08c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
14 deletions
+19
-14
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+3
-3
stack/resilient/pbsready-export.cfg.in
stack/resilient/pbsready-export.cfg.in
+3
-2
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+4
-2
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+9
-7
No files found.
stack/resilient/buildout.cfg
View file @
d1607b52
...
@@ -22,7 +22,7 @@ parts =
...
@@ -22,7 +22,7 @@ parts =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
output = ${buildout:directory}/pbsready.cfg
md5sum =
e09164eeb1577f460efa9b1dcb6cc6c3
md5sum =
9f4212a79f10bee8f6d75061943110e2
mode = 0644
mode = 0644
[pbsready-import]
[pbsready-import]
...
@@ -31,7 +31,7 @@ mode = 0644
...
@@ -31,7 +31,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
output = ${buildout:directory}/pbsready-import.cfg
md5sum =
eda0c1574d8991f4f9e08e3707c2b04b
md5sum =
1b1308fd39476d48b5ca13db48ea6dc9
mode = 0644
mode = 0644
[pbsready-export]
[pbsready-export]
...
@@ -40,7 +40,7 @@ mode = 0644
...
@@ -40,7 +40,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-export.cfg.in
url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg
output = ${buildout:directory}/pbsready-export.cfg
md5sum =
dd56f9c74e580475a17a9afb1d220390
md5sum =
5d9e20c436fd307e8e4ab224a9a65792
mode = 0644
mode = 0644
[template-pull-backup]
[template-pull-backup]
...
...
stack/resilient/pbsready-export.cfg.in
View file @
d1607b52
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
extends = ${pbsready:output}
extends = ${pbsready:output}
parts += cron-entry-backup
parts +=
cron-entry-backup
[
urls
]
[
resilient-publish-connection-parameter
]
notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
[notifier-exporter]
[notifier-exporter]
...
...
stack/resilient/pbsready-import.cfg.in
View file @
d1607b52
...
@@ -2,9 +2,11 @@
...
@@ -2,9 +2,11 @@
extends = ${pbsready:output}
extends = ${pbsready:output}
parts += import-on-notification
parts +=
import-on-notification
resilient-publish-connection-parameter
[
urls
]
[
resilient-publish-connection-parameter
]
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
[import-on-notification]
[import-on-notification]
...
...
stack/resilient/pbsready.cfg.in
View file @
d1607b52
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
parts =
parts =
resiliency
resiliency
urls
logrotate
logrotate
logrotate-entry-cron
logrotate-entry-cron
logrotate-entry-equeue
logrotate-entry-equeue
...
@@ -145,11 +144,6 @@ etc = $${rootdirectory:etc}
...
@@ -145,11 +144,6 @@ etc = $${rootdirectory:etc}
#--
#--
#-- Sets up an rdiff-backup server (with a dropbear server for ssh)
#-- Sets up an rdiff-backup server (with a dropbear server for ssh)
[urls]
ssh-public-key = $${sshkeys-dropbear:public-key-value}
ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
[rdiff-backup-server]
[rdiff-backup-server]
recipe = slapos.cookbook:pbs
recipe = slapos.cookbook:pbs
client = false
client = false
...
@@ -232,4 +226,12 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
...
@@ -232,4 +226,12 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
key = $${slap-parameter:authorized-key}
key = $${slap-parameter:authorized-key}
#----------------
#--
#-- Conncetion informations to re-use.
# XXX-Cedric: when "aggregation" system is done in libslap, directly publish.
[resilient-publish-connection-parameter]
recipe = slapos.cookbook:publish
ssh-public-key = $${sshkeys-dropbear:public-key-value}
ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
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