<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12947] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12947">12947</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 13:04:01 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>backup tool is long obsolete</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbincalendarserver_backup">CalendarServer/trunk/bin/calendarserver_backup</a></li>
<li><a href="#CalendarServertrunkbinpycalendarserver_backup">CalendarServer/trunk/bin/py/calendarserver_backup</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsbackuppy">CalendarServer/trunk/calendarserver/tools/backup.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsbackup_pgpy">CalendarServer/trunk/calendarserver/tools/backup_pg.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincalendarserver_backup"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/calendarserver_backup (12946 => 12947)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/calendarserver_backup 2014-03-18 20:01:07 UTC (rev 12946)
+++ CalendarServer/trunk/bin/calendarserver_backup 2014-03-18 20:04:01 UTC (rev 12947)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" "$@";
</del></span></pre></div>
<a id="CalendarServertrunkbinpycalendarserver_backup"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/py/calendarserver_backup (12946 => 12947)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/py/calendarserver_backup 2014-03-18 20:01:07 UTC (rev 12946)
+++ CalendarServer/trunk/bin/py/calendarserver_backup 2014-03-18 20:04:01 UTC (rev 12947)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-#!/usr/bin/env python
-
-##
-# Copyright (c) 2006-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-import sys
-
-#PYTHONPATH
-
-if __name__ == "__main__":
- try:
- sys.path.insert(0, PYTHONPATH)
- except NameError:
- sys.exc_clear()
-
- from calendarserver.tools.backup import main
- main()
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsbackuppy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/calendarserver/tools/backup.py (12946 => 12947)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/backup.py 2014-03-18 20:01:07 UTC (rev 12946)
+++ CalendarServer/trunk/calendarserver/tools/backup.py 2014-03-18 20:04:01 UTC (rev 12947)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-#!/usr/bin/python
-
-##
-# Copyright (c) 2012-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-from calendarserver.tools.backup_pg import main as main_pg
-
-#
-# FIXME: read the config plist and choose the correct backup
-# implementation based on which DB type is being used.
-# For now, hard code to Postgres.
-#
-main = main_pg
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsbackup_pgpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/calendarserver/tools/backup_pg.py (12946 => 12947)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/backup_pg.py 2014-03-18 20:01:07 UTC (rev 12946)
+++ CalendarServer/trunk/calendarserver/tools/backup_pg.py 2014-03-18 20:04:01 UTC (rev 12947)
</span><span class="lines">@@ -1,221 +0,0 @@
</span><del>-#!/usr/bin/python
-
-##
-# Copyright (c) 2011-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-from __future__ import print_function
-
-from getopt import getopt, GetoptError
-import os
-import subprocess
-import sys
-import tarfile
-
-from twistedcaldav.config import config
-from calendarserver.tools.util import loadConfig
-
-SIPP = "/Applications/Server.app/Contents/ServerRoot"
-if not os.path.exists(SIPP):
- SIPP = ""
-USERNAME = "caldav"
-DATABASENAME = "caldav"
-DUMPFILENAME = "db_backup"
-
-PSQL = "%s/usr/bin/psql" % (SIPP,)
-PGDUMP = "%s/usr/bin/pg_dump" % (SIPP,)
-PGSOCKETDIR = "/var/run/caldavd/PostgresSocket"
-
-def usage(e=None):
- name = os.path.basename(sys.argv[0])
- print("usage: %s [options] command backup-file" % (name,))
- print("")
- print(" Backup or restore calendar and addressbook data")
- print("")
- print("options:")
- print(" -f --config <path>: Specify caldavd.plist configuration path")
- print(" -h --help: print this help and exit")
- print(" -v --verbose: print additional information")
- print("")
- print("commands:")
- print(" backup: create backup-file in compressed tar format (tgz)")
- print(" restore: restore from backup-file")
- print("")
-
- if e:
- sys.stderr.write("%s\n" % (e,))
- sys.exit(64)
- else:
- sys.exit(0)
-
-
-
-def dumpData(dumpFile, verbose=False):
- """
- Use pg_dump to dump data to dumpFile
- """
-
- cmdArgs = [
- PGDUMP,
- "-h", PGSOCKETDIR,
- "--username=%s" % (USERNAME,),
- "--clean",
- "--no-privileges",
- "--file=%s" % (dumpFile,),
- DATABASENAME
- ]
- try:
- if verbose:
- print("\nDumping data to %s" % (dumpFile,))
- print("Executing: %s" % (" ".join(cmdArgs)))
- out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
- if verbose:
- print(out)
- except subprocess.CalledProcessError, e:
- if verbose:
- print(e.output)
- raise BackupError(
- "%s failed:\n%s (exit code = %d)" %
- (PGDUMP, e.output, e.returncode)
- )
-
-
-
-def loadData(dumpFile, verbose=False):
- """
- Use psql to load data from dumpFile
- """
-
- cmdArgs = [
- PSQL,
- "-h", PGSOCKETDIR,
- "--username=%s" % (USERNAME,),
- "--file=%s" % (dumpFile,)
- ]
- try:
- if verbose:
- print("\nLoading data from %s" % (dumpFile,))
- print("Executing: %s" % (" ".join(cmdArgs)))
- out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
- if verbose:
- print(out)
- except subprocess.CalledProcessError, e:
- if verbose:
- print(e.output)
- raise BackupError(
- "%s failed:\n%s (exit code = %d)" %
- (PSQL, e.output, e.returncode)
- )
-
-
-
-class BackupError(Exception):
- pass
-
-
-
-def error(s):
- sys.stderr.write("%s\n" % (s,))
- sys.exit(1)
-
-
-
-def main():
- try:
- (optargs, args) = getopt(
- sys.argv[1:], "f:hv", [
- "config=",
- "help",
- "verbose",
- ],
- )
- except GetoptError, e:
- usage(e)
-
- verbose = False
- configFileName = None
-
- for opt, arg in optargs:
- if opt in ("-h", "--help"):
- usage()
- elif opt in ("-f", "--config"):
- configFileName = arg
- elif opt in ("-v", "--verbose"):
- verbose = True
- else:
- raise NotImplementedError(opt)
-
- if len(args) != 2:
- usage("Must specify a command and a backup-file name.")
-
- command = args[0]
- filename = args[1]
-
- loadConfig(configFileName)
-
- serverRoot = config.ServerRoot
- dataRoot = config.DataRoot
- dumpPath = os.path.join(serverRoot, DUMPFILENAME)
-
- if command == "backup":
-
- try:
- dumpData(dumpPath, verbose=verbose)
-
- if verbose:
- print("Creating %s" % (filename,))
- tar = tarfile.open(filename, "w:gz")
-
- if verbose:
- print("Adding %s" % (serverRoot,))
- tar.add(serverRoot)
-
- if not dataRoot.startswith(serverRoot):
- # DataRoot is not contained within ServerRoot (i.e, it's on
- # another volume)
- if verbose:
- print("Adding %s" % (dataRoot,))
- tar.add(dataRoot)
-
- tar.close()
-
- if verbose:
- print("Done")
- except BackupError, e:
- error("Failed to dump database; error: %s" % (e,))
-
- elif command == "restore":
-
- try:
- tar = tarfile.open(filename, "r:gz")
-
- if verbose:
- print("Extracting from backup file: %s" % (filename,))
- tar.extractall(path="/")
-
- loadData(dumpPath, verbose=verbose)
-
- if verbose:
- print("Cleaning up database dump file: %s" % (dumpPath,))
- os.remove(dumpPath)
-
- except BackupError, e:
- error("Failed to dump database; error: %s" % (e,))
- raise
-
- else:
- error("Unknown command '%s'" % (command,))
-
-if __name__ == "__main__":
- main()
</del></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12946 => 12947)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2014-03-18 20:01:07 UTC (rev 12946)
+++ CalendarServer/trunk/setup.py 2014-03-18 20:04:01 UTC (rev 12947)
</span><span class="lines">@@ -237,28 +237,30 @@
</span><span class="cx"> },
</span><span class="cx"> scripts=[
</span><span class="cx"> "bin/caldavd",
</span><del>- # "bin/calendarserver_backup",
- "bin/calendarserver_bootstrap_database",
- "bin/calendarserver_command_gateway",
- "bin/calendarserver_config",
- # "bin/calendarserver_dbinspect",
- # "bin/calendarserver_dkimtool",
- "bin/calendarserver_export",
- # "bin/calendarserver_icalendar_validate",
- # "bin/calendarserver_load_augmentdb",
- # "bin/calendarserver_manage_postgres",
- "bin/calendarserver_manage_principals",
- "bin/calendarserver_manage_push",
- "bin/calendarserver_manage_timezones",
- "bin/calendarserver_migrate_resources",
- # "bin/calendarserver_monitor_amp_notifications",
- # "bin/calendarserver_monitor_notifications",
- "bin/calendarserver_purge_attachments",
- "bin/calendarserver_purge_events",
- "bin/calendarserver_purge_principals",
- "bin/calendarserver_shell",
- "bin/calendarserver_upgrade",
- # "bin/calendarserver_verify_data",
</del><ins>+ "bin/py/calendarserver_bootstrap_database",
+ # "bin/py/calendarserver_check_database_schema",
+ "bin/py/calendarserver_command_gateway",
+ "bin/py/calendarserver_config",
+ # "bin/py/calendarserver_dashboard",
+ # "bin/py/calendarserver_dbinspect",
+ # "bin/py/calendarserver_dkimtool",
+ "bin/py/calendarserver_export",
+ # "bin/py/calendarserver_icalendar_validate",
+ # "bin/py/calendarserver_load_augmentdb",
+ # "bin/py/calendarserver_manage_postgres",
+ "bin/py/calendarserver_manage_principals",
+ "bin/py/calendarserver_manage_push",
+ "bin/py/calendarserver_manage_timezones",
+ "bin/py/calendarserver_migrate_resources",
+ # "bin/py/calendarserver_monitor_amp_notifications",
+ # "bin/py/calendarserver_monitor_notifications",
+ # "bin/py/calendarserver_monitor_work",
+ "bin/py/calendarserver_purge_attachments",
+ "bin/py/calendarserver_purge_events",
+ "bin/py/calendarserver_purge_principals",
+ "bin/py/calendarserver_shell",
+ "bin/py/calendarserver_upgrade",
+ # "bin/py/calendarserver_verify_data",
</ins><span class="cx"> ],
</span><span class="cx"> data_files=[
</span><span class="cx"> ("caldavd", ["conf/caldavd.plist"]),
</span></span></pre>
</div>
</div>
</body>
</html>