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
Cédric Le Ninivin
slapos
Commits
c8d385fe
Commit
c8d385fe
authored
Jul 23, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5-component' into erp5
parents
dddb7942
48eea047
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
26 deletions
+42
-26
component/dcron/buildout.cfg
component/dcron/buildout.cfg
+10
-2
component/dcron/dcron-4.4.noroot.no.globals.patch
component/dcron/dcron-4.4.noroot.no.globals.patch
+13
-5
component/dcron/dcron-hooks.py
component/dcron/dcron-hooks.py
+5
-0
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-2
slapos/recipe/generic_varnish/template/varnishd.in
slapos/recipe/generic_varnish/template/varnishd.in
+1
-0
software/backupserver/software.cfg
software/backupserver/software.cfg
+11
-17
No files found.
component/dcron/buildout.cfg
View file @
c8d385fe
...
@@ -4,9 +4,16 @@ extends =
...
@@ -4,9 +4,16 @@ extends =
parts = dcron-output
parts = dcron-output
[dcron-hooks-download]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum = 860e914dff4108b47565965fe5ebc7b5
download-only = true
filename = dcron-hooks.py
[dcron-patch-nonroot]
[dcron-patch-nonroot]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
md5sum =
2f5b22dc1cbe81060a9c28e6f5c06e8b
md5sum =
d5408ab682b65cc1eda40d588fcd7db8
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
filename = dcron-4.4.noroot.no.globals.patch
filename = dcron-4.4.noroot.no.globals.patch
download-only = true
download-only = true
...
@@ -21,12 +28,13 @@ patches =
...
@@ -21,12 +28,13 @@ patches =
patch-options = -p1
patch-options = -p1
make-options =
make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
post-make-hook = ${dcron-hooks-download:location}/${dcron-hooks-download:filename}:post_make_hook
[dcron-output]
[dcron-output]
# Shared binary location to ease migration
# Shared binary location to ease migration
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab}
command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab}
-a ! -u ${:crontab}
crond = ${dcron:location}/sbin/crond
crond = ${dcron:location}/sbin/crond
crontab = ${dcron:location}/bin/crontab
crontab = ${dcron:location}/bin/crontab
component/dcron/dcron-4.4.noroot.no.globals.patch
View file @
c8d385fe
#
Patch for making dcron usable without root user, as a local service
diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
--- dcron-4.4.org/chuser.c 2010-01-18 16:27:31.000000000 +0100
--- dcron-4.4.org/chuser.c 2010-01-18 16:27:31.000000000 +0100
+++ dcron-4.4/chuser.c 201
1-04-01 11:19:19.000000000
+0200
+++ dcron-4.4/chuser.c 201
3-07-18 18:17:16.342147418
+0200
@@ -14,47 +14,6 @@
@@ -14,47 +14,6 @@
int
int
ChangeUser(const char *user, char *dochdir)
ChangeUser(const char *user, char *dochdir)
...
@@ -53,7 +52,16 @@ diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
...
@@ -53,7 +52,16 @@ diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
--- dcron-4.4.org/crontab.c 2010-01-18 16:27:31.000000000 +0100
--- dcron-4.4.org/crontab.c 2010-01-18 16:27:31.000000000 +0100
+++ dcron-4.4/crontab.c 2011-04-01 11:19:19.000000000 +0200
+++ dcron-4.4/crontab.c 2013-07-18 18:18:07.768535485 +0200
@@ -88,7 +88,7 @@
break;
case 'c':
/* getopt guarantees optarg != 0 here */
- if (*optarg != 0 && getuid() == geteuid()) {
+ if (*optarg != 0) {
CDir = optarg;
} else {
printlogf(0, "-c option: superuser only");
@@ -316,9 +316,6 @@
@@ -316,9 +316,6 @@
close(filedes[0]);
close(filedes[0]);
...
@@ -75,7 +83,7 @@ diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
...
@@ -75,7 +83,7 @@ diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
ptr = PATH_VI;
ptr = PATH_VI;
diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
--- dcron-4.4.org/job.c 2010-01-18 16:27:31.000000000 +0100
--- dcron-4.4.org/job.c 2010-01-18 16:27:31.000000000 +0100
+++ dcron-4.4/job.c 201
1-04-01 11:19:19.000000000
+0200
+++ dcron-4.4/job.c 201
3-07-18 18:17:16.342147418
+0200
@@ -62,14 +62,6 @@
@@ -62,14 +62,6 @@
* Change running state to the user in question
* Change running state to the user in question
*/
*/
...
@@ -108,7 +116,7 @@ diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
...
@@ -108,7 +116,7 @@ diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
/*
/*
diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
--- dcron-4.4.org/Makefile 2010-01-18 16:27:31.000000000 +0100
--- dcron-4.4.org/Makefile 2010-01-18 16:27:31.000000000 +0100
+++ dcron-4.4/Makefile 201
1-04-01 11:19:35.000000000
+0200
+++ dcron-4.4/Makefile 201
3-07-18 18:17:16.342147418
+0200
@@ -3,7 +3,6 @@
@@ -3,7 +3,6 @@
# these variables can be configured by e.g. `make SCRONTABS=/different/path`
# these variables can be configured by e.g. `make SCRONTABS=/different/path`
...
...
component/dcron/dcron-hooks.py
0 → 100644
View file @
c8d385fe
import
os
import
shutil
def
post_make_hook
(
options
,
buildout
):
crontab_path
=
os
.
path
.
join
(
options
[
'location'
],
'bin'
,
'crontab'
)
os
.
chmod
(
crontab_path
,
0750
)
component/mariadb/buildout.cfg
View file @
c8d385fe
...
@@ -25,10 +25,10 @@ download-only = true
...
@@ -25,10 +25,10 @@ download-only = true
[mariadb]
[mariadb]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
version = 5.5.3
1
version = 5.5.3
2
revision = 1
revision = 1
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
md5sum =
3fe756bc76f0e7a3af2757e48ce0f3f4
md5sum =
565c2dce6a2fb027c9d0ffbae4934135
# compile directory is required to build mysql plugins.
# compile directory is required to build mysql plugins.
keep-compile-dir = true
keep-compile-dir = true
patch-options = -p0
patch-options = -p0
...
...
slapos/recipe/generic_varnish/template/varnishd.in
View file @
c8d385fe
...
@@ -4,6 +4,7 @@ DAEMON_OPTS="-F \
...
@@ -4,6 +4,7 @@ DAEMON_OPTS="-F \
-a %(varnish_ip)s:%(varnishd_server_port)s \
-a %(varnish_ip)s:%(varnishd_server_port)s \
-T %(varnish_ip)s:%(varnishd_manager_port)s \
-T %(varnish_ip)s:%(varnishd_manager_port)s \
-t 0 \
-t 0 \
-p nuke_limit=500 \
-n %(varnish_instance_name)s \
-n %(varnish_instance_name)s \
-f %(vcl_file)s \
-f %(vcl_file)s \
-s file,%(varnish_data)s/varnish_storage.bin,1G"
-s file,%(varnish_data)s/varnish_storage.bin,1G"
...
...
software/backupserver/software.cfg
View file @
c8d385fe
[buildout]
[buildout]
extends =
extends =
../../component/lxml-python/buildout.cfg
../../component/dash/buildout.cfg
../../component/dash/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
...
@@ -12,11 +11,10 @@ extends =
...
@@ -12,11 +11,10 @@ extends =
../../component/rsync/buildout.cfg
../../component/rsync/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/grep/buildout.cfg
../../component/grep/buildout.cfg
../../stack/flask.cfg
#
../../stack/flask.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
parts =
parts =
eggs
rdiff-backup
rdiff-backup
# duplicity
# duplicity
dcron
dcron
...
@@ -30,6 +28,7 @@ parts =
...
@@ -30,6 +28,7 @@ parts =
template-pullrdiffbackup
template-pullrdiffbackup
template-backup-script
template-backup-script
template-crontab-line
template-crontab-line
slapos-cookbook
[networkcache]
[networkcache]
# signature certificates of the following uploaders.
# signature certificates of the following uploaders.
...
@@ -161,15 +160,6 @@ signature-certificate-list =
...
@@ -161,15 +160,6 @@ signature-certificate-list =
m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-----END CERTIFICATE-----
-----END CERTIFICATE-----
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
[directory]
recipe = slapos.cookbook:mkdirectory
template = ${buildout:directory}/template
##########################################################
##########################################################
# Service startup scripts and configuration files
# Service startup scripts and configuration files
##########################################################
##########################################################
...
@@ -177,28 +167,28 @@ template = ${buildout:directory}/template
...
@@ -177,28 +167,28 @@ template = ${buildout:directory}/template
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-dcron-service.sh.in
url = ${:_profile_base_location_}/template-dcron-service.sh.in
md5sum = 1372441dac23e4fa7d2dc773a74725ea
md5sum = 1372441dac23e4fa7d2dc773a74725ea
output = ${
directory:template
}/template-dcron-service.sh.in
output = ${
buildout:directory
}/template-dcron-service.sh.in
mode = 0644
mode = 0644
[template-backup-script]
[template-backup-script]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-backup-script.sh.in
url = ${:_profile_base_location_}/template-backup-script.sh.in
md5sum = 19c3a72913cc285bf9745ab2f869018e
md5sum = 19c3a72913cc285bf9745ab2f869018e
output = ${
directory:template
}/template-backup-script.sh.in
output = ${
buildout:directory
}/template-backup-script.sh.in
mode = 0644
mode = 0644
[template-crontab-line]
[template-crontab-line]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-crontab-line.in
url = ${:_profile_base_location_}/template-crontab-line.in
md5sum = 5cbd64f04da0601ba4286516a6161f5e
md5sum = 5cbd64f04da0601ba4286516a6161f5e
output = ${
directory:template
}/template-crontab-line.in
output = ${
buildout:directory
}/template-crontab-line.in
mode = 0644
mode = 0644
[template-crontab]
[template-crontab]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-crontab.in
url = ${:_profile_base_location_}/template-crontab.in
md5sum = 072be0fd04896880c931d44d8eabde37
md5sum = 072be0fd04896880c931d44d8eabde37
output = ${
directory:template
}/template-crontab.in
output = ${
buildout:directory
}/template-crontab.in
mode = 0644
mode = 0644
##########################################################
##########################################################
...
@@ -208,7 +198,7 @@ mode = 0644
...
@@ -208,7 +198,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in
url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in
md5sum = 62c236773dadecac11eb9a47dbca9351
md5sum = 62c236773dadecac11eb9a47dbca9351
output = ${
directory:template
}/template-pullrdiffbackup.cfg
output = ${
buildout:directory
}/template-pullrdiffbackup.cfg
mode = 0644
mode = 0644
[template]
[template]
...
@@ -294,3 +284,7 @@ xml-marshaller = 0.9.7
...
@@ -294,3 +284,7 @@ xml-marshaller = 0.9.7
# slapos.core==0.35.1
# slapos.core==0.35.1
zope.interface = 4.0.5
zope.interface = 4.0.5
cliff = 1.4
cmd2 = 0.6.5.1
prettytable = 0.7.2
requests = 1.2.3
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