<!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>[12951] 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/12951">12951</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 13:22:20 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nuke calendarserver_manage_postgres</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_manage_postgres">CalendarServer/trunk/bin/calendarserver_manage_postgres</a></li>
<li><a href="#CalendarServertrunkbinpycalendarserver_manage_postgres">CalendarServer/trunk/bin/py/calendarserver_manage_postgres</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsmanagepostgrespy">CalendarServer/trunk/calendarserver/tools/managepostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincalendarserver_manage_postgres"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/calendarserver_manage_postgres (12950 => 12951)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/calendarserver_manage_postgres 2014-03-18 20:20:17 UTC (rev 12950)
+++ CalendarServer/trunk/bin/calendarserver_manage_postgres 2014-03-18 20:22:20 UTC (rev 12951)
</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_manage_postgres"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/py/calendarserver_manage_postgres (12950 => 12951)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/py/calendarserver_manage_postgres 2014-03-18 20:20:17 UTC (rev 12950)
+++ CalendarServer/trunk/bin/py/calendarserver_manage_postgres 2014-03-18 20:22:20 UTC (rev 12951)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-#!/usr/bin/env python
-##
-# Copyright (c) 2010-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.managepostgres import main
- main()
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsmanagepostgrespy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/calendarserver/tools/managepostgres.py (12950 => 12951)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/managepostgres.py 2014-03-18 20:20:17 UTC (rev 12950)
+++ CalendarServer/trunk/calendarserver/tools/managepostgres.py 2014-03-18 20:22:20 UTC (rev 12951)
</span><span class="lines">@@ -1,132 +0,0 @@
</span><del>-#!/usr/bin/env python
-##
-# Copyright (c) 2009-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 optparse import OptionParser
-import os
-import subprocess
-import sys
-import time
-
-def error(s):
- print(s)
- sys.exit(1)
-
-
-
-def cmd(s):
- print(s)
- subprocess.call(s, shell=True)
-
-
-
-def doInit(basedir):
-
- cmd("mkdir %s/data" % (basedir,))
- cmd("%s/bin/initdb -D %s/data" % (basedir, basedir,))
-
- # Have the DB listen on all interfaces
- with open("%s/data/postgresql.conf" % (basedir,)) as f:
- conf = f.read()
- conf = conf.replace("#listen_addresses = 'localhost'", "listen_addresses = '*'\t")
- conf = conf.replace("max_connections = 20 ", "max_connections = 500")
- with open("%s/data/postgresql.conf" % (basedir,), "w") as f:
- f.write(conf)
-
- # Allow current user to auth to the DBs
- with open("%s/data/pg_hba.conf" % (basedir,)) as f:
- conf = f.read()
- conf = conf.replace("127.0.0.1/32", "0.0.0.0/0 ")
- with open("%s/data/pg_hba.conf" % (basedir,), "w") as f:
- f.write(conf)
-
- cmd("%s/bin/pg_ctl -D %s/data -l logfile start" % (basedir, basedir,))
- time.sleep(5)
- cmd("%s/bin/createdb proxies" % (basedir,))
- cmd("%s/bin/createdb augments" % (basedir,))
- cmd("%s/bin/pg_ctl -D %s/data -l logfile stop" % (basedir, basedir,))
-
-
-
-def doStart(basedir):
-
- cmd("%s/bin/pg_ctl -D %s/data -l logfile start" % (basedir, basedir,))
-
-
-
-def doStop(basedir):
-
- cmd("%s/bin/pg_ctl -D %s/data -l logfile stop" % (basedir, basedir,))
-
-
-
-def doRun(basedir, verbose):
-
- cmd("%s/bin/postgres %s -D %s/data" % (basedir, "-d 3" if verbose else "", basedir,))
-
-
-
-def doClean(basedir):
-
- cmd("rm -rf %s/data" % (basedir,))
-
-
-
-def main():
-
- usage = "%prog [options] ACTION"
- epilog = """
-ACTION is one of init|start|stop|run
-
- init: initialize databases
- start: start postgres daemon
- stop: stop postgres daemon
- run: run postgres (non-daemon)
- clean: remove databases
-
-"""
- description = "Tool to manage PostgreSQL"
- version = "%prog v1.0"
- parser = OptionParser(usage=usage, description=description, version=version)
- parser.epilog = epilog
- parser.format_epilog = lambda _: epilog
-
- parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
- default=True, help="Use debug logging for PostgreSQL")
- parser.add_option("-d", "--base-dir", dest="basedir",
- default="%s/../postgresql-8.4.2/_root" % (os.getcwd(),), help="Base directory for PostgreSQL install")
-
- (options, args) = parser.parse_args()
-
- if len(args) != 1:
- parser.error("incorrect number of arguments")
-
- if args[0] == "init":
- doInit(options.basedir)
- elif args[0] == "start":
- doStart(options.basedir)
- elif args[0] == "stop":
- doStop(options.basedir)
- elif args[0] == "run":
- doRun(options.basedir, options.verbose)
- elif args[0] == "clean":
- doClean(options.basedir)
- else:
- parser.error("incorrect argument '%s'" % (args[0],))
-
-if __name__ == '__main__':
- main()
</del></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12950 => 12951)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2014-03-18 20:20:17 UTC (rev 12950)
+++ CalendarServer/trunk/setup.py 2014-03-18 20:22:20 UTC (rev 12951)
</span><span class="lines">@@ -245,7 +245,6 @@
</span><span class="cx"> # "bin/py/calendarserver_dkimtool",
</span><span class="cx"> "bin/py/calendarserver_export",
</span><span class="cx"> # "bin/py/calendarserver_icalendar_validate",
</span><del>- # "bin/py/calendarserver_manage_postgres",
</del><span class="cx"> "bin/py/calendarserver_manage_principals",
</span><span class="cx"> "bin/py/calendarserver_manage_push",
</span><span class="cx"> "bin/py/calendarserver_manage_timezones",
</span></span></pre>
</div>
</div>
</body>
</html>