From 9815c43679fb4e72ff3d0c2ba73765bf8f313d96 Mon Sep 17 00:00:00 2001 From: Marco Mariani <marco.mariani@nexedi.com> Date: Tue, 15 Jan 2013 15:11:29 +0100 Subject: [PATCH] extracted backup recipes from __init__.py --- setup.py | 4 +- slapos/recipe/postgres/__init__.py | 81 --------------------- slapos/recipe/postgres/backup.py | 113 +++++++++++++++++++++++++++++ software/maarch/software.cfg | 2 +- 4 files changed, 116 insertions(+), 84 deletions(-) create mode 100644 slapos/recipe/postgres/backup.py diff --git a/setup.py b/setup.py index 53efaeafd..e64961a06 100755 --- a/setup.py +++ b/setup.py @@ -137,8 +137,8 @@ setup(name=name, 'onetimeupload = slapos.recipe.onetimeupload:Recipe', 'pbs = slapos.recipe.pbs:Recipe', 'postgres = slapos.recipe.postgres:Recipe', - 'postgres.export = slapos.recipe.postgres:ExportRecipe', - 'postgres.import = slapos.recipe.postgres:ImportRecipe', + 'postgres.export = slapos.recipe.postgres.backup:ExportRecipe', + 'postgres.import = slapos.recipe.postgres.backup:ImportRecipe', 'proactive = slapos.recipe.proactive:Recipe', 'publish = slapos.recipe.publish:Recipe', 'publishurl = slapos.recipe.publishurl:Recipe', diff --git a/slapos/recipe/postgres/__init__.py b/slapos/recipe/postgres/__init__.py index 2315dd6eb..2d88bc8e0 100644 --- a/slapos/recipe/postgres/__init__.py +++ b/slapos/recipe/postgres/__init__.py @@ -228,84 +228,3 @@ class Recipe(GenericBaseRecipe): self.createExecutable(name, content=content) - -class ExportRecipe(GenericBaseRecipe): - """\ - This recipe creates an exporter script for using with the resilient stack. - - Required options: - backup-directory - folder that will contain the dump file. - bin - path to the 'pg_dump' binary. - dbname - name of the database to dump. - pgdata-directory - path to postgres configuration and data. - wrapper - full path of the exporter script to create. - """ - - def install(self): - wrapper = self.options['wrapper'] - self.createBackupScript(wrapper) - return [wrapper] - - - def createBackupScript(self, wrapper): - """\ - Create a script to backup the database in 'custom' format. - """ - content = textwrap.dedent("""\ - #!/bin/sh - umask 077 - %(bin)s/pg_dump \\ - --host=%(pgdata-directory)s \\ - --format=custom \\ - --file=%(backup-directory)s/database.dump \\ - %(dbname)s - """ % self.options) - self.createExecutable(wrapper, content=content) - - - -class ImportRecipe(GenericBaseRecipe): - """\ - This recipe creates an importer script for using with the resilient stack. - - Required options: - backup-directory - folder that contains the dump file. - bin - path to the 'pg_restore' binary. - dbname - name of the database to restore. - pgdata-directory - path to postgres configuration and data. - wrapper - full path of the importer script to create. - """ - - def install(self): - wrapper = self.options['wrapper'] - self.createRestoreScript(wrapper) - return [wrapper] - - - def createRestoreScript(self, wrapper): - """\ - Create a script to restore the database from 'custom' format. - """ - content = textwrap.dedent("""\ - #!/bin/sh - %(bin)s/pg_restore \\ - --host=%(pgdata-directory)s \\ - --dbname=%(dbname)s \\ - --clean \\ - --no-owner \\ - --no-acl \\ - %(backup-directory)s/database.dump - """ % self.options) - self.createExecutable(wrapper, content=content) - - diff --git a/slapos/recipe/postgres/backup.py b/slapos/recipe/postgres/backup.py new file mode 100644 index 000000000..4341fe345 --- /dev/null +++ b/slapos/recipe/postgres/backup.py @@ -0,0 +1,113 @@ +############################################################################## +# +# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved. +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsibility of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# guarantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +import textwrap + +from slapos.recipe.librecipe import GenericBaseRecipe + + + +class ExportRecipe(GenericBaseRecipe): + """\ + This recipe creates an exporter script for using with the resilient stack. + + Required options: + backup-directory + folder that will contain the dump file. + bin + path to the 'pg_dump' binary. + dbname + name of the database to dump. + pgdata-directory + path to postgres configuration and data. + wrapper + full path of the exporter script to create. + """ + + def install(self): + wrapper = self.options['wrapper'] + self.createBackupScript(wrapper) + return [wrapper] + + + def createBackupScript(self, wrapper): + """\ + Create a script to backup the database in 'custom' format. + """ + content = textwrap.dedent("""\ + #!/bin/sh + umask 077 + %(bin)s/pg_dump \\ + --host=%(pgdata-directory)s \\ + --format=custom \\ + --file=%(backup-directory)s/database.dump \\ + %(dbname)s + """ % self.options) + self.createExecutable(wrapper, content=content) + + + +class ImportRecipe(GenericBaseRecipe): + """\ + This recipe creates an importer script for using with the resilient stack. + + Required options: + backup-directory + folder that contains the dump file. + bin + path to the 'pg_restore' binary. + dbname + name of the database to restore. + pgdata-directory + path to postgres configuration and data. + wrapper + full path of the importer script to create. + """ + + def install(self): + wrapper = self.options['wrapper'] + self.createRestoreScript(wrapper) + return [wrapper] + + + def createRestoreScript(self, wrapper): + """\ + Create a script to restore the database from 'custom' format. + """ + content = textwrap.dedent("""\ + #!/bin/sh + %(bin)s/pg_restore \\ + --host=%(pgdata-directory)s \\ + --dbname=%(dbname)s \\ + --clean \\ + --no-owner \\ + --no-acl \\ + %(backup-directory)s/database.dump + """ % self.options) + self.createExecutable(wrapper, content=content) + + diff --git a/software/maarch/software.cfg b/software/maarch/software.cfg index b5acc73c3..1f6a03d47 100644 --- a/software/maarch/software.cfg +++ b/software/maarch/software.cfg @@ -52,7 +52,7 @@ command = #---------------- #-- #-- Main application part -#-- XXX provide a better URL +#-- [application] url = http://downloads.sourceforge.net/project/maarch/Maarch%20Entreprise/MaarchEntreprise-1.3.zip -- 2.30.9