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
Xiaohe Cao
slapos
Commits
9e505781
Commit
9e505781
authored
Sep 21, 2011
by
Antoine Catton
Committed by
Cédric de Saint Martin
Oct 13, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless SSL certificates backup
parent
d5e875bd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
14 deletions
+1
-14
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/__init__.py
+0
-10
software/mariadb/instance.cfg
software/mariadb/instance.cfg
+0
-1
software/mariadb/software.cfg
software/mariadb/software.cfg
+1
-3
No files found.
slapos/recipe/mysql/__init__.py
View file @
9e505781
...
@@ -141,7 +141,6 @@ class Recipe(BaseSlapRecipe):
...
@@ -141,7 +141,6 @@ class Recipe(BaseSlapRecipe):
def
installCertificateAuthority
(
self
,
ca_country_code
=
'XX'
,
def
installCertificateAuthority
(
self
,
ca_country_code
=
'XX'
,
ca_email
=
'xx@example.com'
,
ca_state
=
'State'
,
ca_city
=
'City'
,
ca_email
=
'xx@example.com'
,
ca_state
=
'State'
,
ca_city
=
'City'
,
ca_company
=
'Company'
):
ca_company
=
'Company'
):
backup_path
=
self
.
createBackupDirectory
(
'ca'
)
self
.
ca_dir
=
os
.
path
.
join
(
self
.
data_root_directory
,
'ca'
)
self
.
ca_dir
=
os
.
path
.
join
(
self
.
data_root_directory
,
'ca'
)
self
.
_createDirectory
(
self
.
ca_dir
)
self
.
_createDirectory
(
self
.
ca_dir
)
self
.
ca_request_dir
=
os
.
path
.
join
(
self
.
ca_dir
,
'requests'
)
self
.
ca_request_dir
=
os
.
path
.
join
(
self
.
ca_dir
,
'requests'
)
...
@@ -182,15 +181,6 @@ class Recipe(BaseSlapRecipe):
...
@@ -182,15 +181,6 @@ class Recipe(BaseSlapRecipe):
crl
=
os
.
path
.
join
(
self
.
ca_crl
),
crl
=
os
.
path
.
join
(
self
.
ca_crl
),
request_dir
=
self
.
ca_request_dir
request_dir
=
self
.
ca_request_dir
)]))
)]))
# configure backup
backup_cron
=
os
.
path
.
join
(
self
.
cron_d
,
'ca_rdiff_backup'
)
open
(
backup_cron
,
'w'
).
write
(
'''0 0 * * * %(rdiff_backup)s %(source)s %(destination)s'''
%
dict
(
rdiff_backup
=
self
.
options
[
'rdiff_backup_binary'
],
source
=
self
.
ca_dir
,
destination
=
backup_path
))
self
.
path_list
.
append
(
backup_cron
)
return
dict
(
return
dict
(
ca_certificate
=
os
.
path
.
join
(
config
[
'ca_dir'
],
'cacert.pem'
),
ca_certificate
=
os
.
path
.
join
(
config
[
'ca_dir'
],
'cacert.pem'
),
ca_crl
=
os
.
path
.
join
(
config
[
'ca_dir'
],
'crl'
),
ca_crl
=
os
.
path
.
join
(
config
[
'ca_dir'
],
'crl'
),
...
...
software/mariadb/instance.cfg
View file @
9e505781
...
@@ -17,4 +17,3 @@ mysqldump_binary = ${mariadb:location}/bin/mysqldump
...
@@ -17,4 +17,3 @@ mysqldump_binary = ${mariadb:location}/bin/mysqldump
openssl_binary = ${openssl:location}/bin/openssl
openssl_binary = ${openssl:location}/bin/openssl
stunnel_binary = ${stunnel:location}/bin/stunnel
stunnel_binary = ${stunnel:location}/bin/stunnel
gzip_binary = ${gzip:location}/bin/gzip
gzip_binary = ${gzip:location}/bin/gzip
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
software/mariadb/software.cfg
View file @
9e505781
...
@@ -12,7 +12,6 @@ extends =
...
@@ -12,7 +12,6 @@ extends =
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/gzip/buildout.cfg
../../component/gzip/buildout.cfg
../../stack/shacache-client.cfg
../../stack/shacache-client.cfg
...
@@ -38,7 +37,6 @@ parts =
...
@@ -38,7 +37,6 @@ parts =
libxslt
libxslt
eggs
eggs
gzip
gzip
rdiff-backup
instance-recipe-egg
instance-recipe-egg
# XXX: Workaround of SlapOS limitation
# XXX: Workaround of SlapOS limitation
...
@@ -70,7 +68,7 @@ eggs =
...
@@ -70,7 +68,7 @@ eggs =
# Default template for the instance.
# Default template for the instance.
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
98a9939c04a1a7c7ab6a6b2c1c6e595e
md5sum =
bc6cfa74b8b80879e9564f18ce1e3791
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
dollar = $
dollar = $
...
...
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