Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
6a181e06
Commit
6a181e06
authored
Apr 20, 2017
by
Vincent Pelletier
Committed by
Rafael Monnerat
May 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/slaprunner: Exclude all buildout-managed files.
parent
4ee761cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
3 deletions
+18
-3
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+3
-3
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-0
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+1
-0
software/slaprunner/instance.cfg
software/slaprunner/instance.cfg
+1
-0
software/slaprunner/template/runner-export.sh.jinja2
software/slaprunner/template/runner-export.sh.jinja2
+12
-0
No files found.
software/slaprunner/buildout.hash.cfg
View file @
6a181e06
...
...
@@ -15,7 +15,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum =
afd426c01891d06e95f17b622ecd172f
md5sum =
43b3f80bc368a5b246e0f0e80e7e3c01
[template-runner]
filename = instance-runner.cfg
...
...
@@ -31,11 +31,11 @@ md5sum = 9db9957f452bda370cb2d5cc2e833e85
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
md5sum =
a8cb62a948300e6641af935e81ac4aef
md5sum =
5fab5c6867a57adf6dcf7b8dc758358a
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum =
e9aa653417a85ed2a7a7ccfb64668ace
md5sum =
2a29bcf1c857721eb2462d9cb9d20386
[template-resilient]
filename = instance-resilient.cfg.jinja2
...
...
software/slaprunner/common.cfg
View file @
6a181e06
...
...
@@ -7,6 +7,7 @@ extends =
../../component/curl/buildout.cfg
../../component/dash/buildout.cfg
../../component/dcron/buildout.cfg
../../component/gawk/buildout.cfg
../../component/git/buildout.cfg
../../component/tig/buildout.cfg
../../component/logrotate/buildout.cfg
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
6a181e06
...
...
@@ -64,6 +64,7 @@ port = ${supervisord-free-port:port}
[exporter-configuration]
coreutils-location = {{ dumps(parameter_dict['coreutils-location']) }}
gawk-location = {{ dumps(parameter_dict['gawk-location']) }}
[exporter]
recipe = slapos.recipe.template:jinja2
...
...
software/slaprunner/instance.cfg
View file @
6a181e06
...
...
@@ -49,6 +49,7 @@ mode = 0644
[template-runner-export-configuration]
coreutils-location = ${coreutils:location}
gawk-location = ${gawk:location}
[template-runner-export]
recipe = slapos.recipe.template:jinja2
...
...
software/slaprunner/template/runner-export.sh.jinja2
View file @
6a181e06
...
...
@@ -40,6 +40,7 @@ relativise () {
if [ -d instance ]; then
# Concatenate the exclude file of each partition of webrunner
# to create a global exclude file.
# Also, ignore all buildout-managed files.
(
echo "*.sock"
echo "*.socket"
...
...
@@ -52,6 +53,17 @@ relativise () {
if [ -r "$exclude_file" ]; then
relativise "$path" < "$exclude_file"
fi
for installed in .installed*.cfg; do
if [ -r "$installed" ]; then
# Print every line from each __buildout_installed__ found.
'{{ parameter_dict["gawk-location"] }}/bin/gawk' '
BEGIN { do_print = 0 }
match($0, /^__buildout_installed__\s*=\s*(\S.*)/, ary) { do_print = 1; print ary[1]; next }
/^\S/ { do_print = 0; next }
match($0, /^\s+(\S.*)/, ary) { if (do_print) print ary[1] }
' "$installed" | relativise "$path"
fi
done
done
) | rsync --exclude-from=- instance "$backup_path"
fi
...
...
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