<!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>[12948] 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/12948">12948</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 13:11:18 -0700 (Tue, 18 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>calendarserver_bootstrap_database is obsolete</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
<li><a href="#CalendarServertrunksupportApplemake">CalendarServer/trunk/support/Apple.make</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbincalendarserver_bootstrap_database">CalendarServer/trunk/bin/calendarserver_bootstrap_database</a></li>
<li><a href="#CalendarServertrunkbinpycalendarserver_bootstrap_database">CalendarServer/trunk/bin/py/calendarserver_bootstrap_database</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsbootstrapdatabasepy">CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py</a></li>
<li><a href="#CalendarServertrunkdoccalendarserver_bootstrap_database8">CalendarServer/trunk/doc/calendarserver_bootstrap_database.8</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincalendarserver_bootstrap_database"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/calendarserver_bootstrap_database (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/calendarserver_bootstrap_database        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/bin/calendarserver_bootstrap_database        2014-03-18 20:11:18 UTC (rev 12948)
</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 &quot;License&quot;);
-# 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 &quot;AS IS&quot; 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=&quot;$(cd &quot;$(dirname &quot;$0&quot;)/..&quot; &amp;&amp; pwd)&quot;;
-
-. &quot;${wd}/bin/_build.sh&quot;;
-
-do_setup=&quot;false&quot;;
-
-develop &gt; /dev/null;
-
-exec &quot;${python}&quot; &quot;${wd}/bin/py/$(basename &quot;$0&quot;)&quot; &quot;$@&quot;;
</del></span></pre></div>
<a id="CalendarServertrunkbinpycalendarserver_bootstrap_database"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/py/calendarserver_bootstrap_database (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/py/calendarserver_bootstrap_database        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/bin/py/calendarserver_bootstrap_database        2014-03-18 20:11:18 UTC (rev 12948)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-#!/usr/bin/env python
-
-##
-# Copyright (c) 2011-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-# 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 &quot;AS IS&quot; 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__ == &quot;__main__&quot;:
-    try:
-        sys.path.insert(0, PYTHONPATH)
-    except NameError:
-        sys.exc_clear()
-
-    from calendarserver.tools.bootstrapdatabase import main
-    main()
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsbootstrapdatabasepy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/calendarserver/tools/bootstrapdatabase.py        2014-03-18 20:11:18 UTC (rev 12948)
</span><span class="lines">@@ -1,278 +0,0 @@
</span><del>-##
-# Copyright (c) 2011-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-# 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 &quot;AS IS&quot; 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 re
-import subprocess
-import sys
-
-CONNECTNAME = &quot;_postgres&quot;
-USERNAME = &quot;caldav&quot;
-DATABASENAME = &quot;caldav&quot;
-PGSOCKETDIR = &quot;/Library/Server/PostgreSQL For Server Services/Socket&quot;
-SCHEMAFILE = &quot;/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/txdav/common/datastore/sql_schema/current.sql&quot;
-
-# Executables:
-CREATEDB = &quot;/Applications/Server.app/Contents/ServerRoot/usr/bin/createdb&quot;
-CREATEUSER = &quot;/Applications/Server.app/Contents/ServerRoot/usr/bin/createuser&quot;
-PSQL = &quot;/Applications/Server.app/Contents/ServerRoot/usr/bin/psql&quot;
-
-def usage(e=None):
-    name = os.path.basename(sys.argv[0])
-    print(&quot;usage: %s [options] username&quot; % (name,))
-    print(&quot;&quot;)
-    print(&quot; Bootstrap calendar server postgres database and schema&quot;)
-    print(&quot;&quot;)
-    print(&quot;options:&quot;)
-    print(&quot;  -h --help: print this help and exit&quot;)
-    print(&quot;  -v --verbose: print additional information&quot;)
-    print(&quot;&quot;)
-
-    if e:
-        sys.stderr.write(&quot;%s\n&quot; % (e,))
-        sys.exit(64)
-    else:
-        sys.exit(0)
-
-
-
-def createUser(verbose=False):
-    &quot;&quot;&quot;
-    Create the user which calendar server will use to access postgres.
-    Return True if user is created, False if user already existed.
-    Raise BootstrapError if there is an issue.
-    &quot;&quot;&quot;
-
-    cmdArgs = [
-        CREATEUSER,
-        &quot;-h&quot;, PGSOCKETDIR,
-        &quot;--username=%s&quot; % (CONNECTNAME,),
-        USERNAME,
-        &quot;--no-superuser&quot;,
-        &quot;--createdb&quot;,
-        &quot;--no-createrole&quot;
-    ]
-    try:
-        if verbose:
-            print(&quot;\nAttempting to create user...&quot;)
-            print(&quot;Executing: %s&quot; % (&quot; &quot;.join(cmdArgs)))
-        out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
-        if verbose:
-            print(out)
-        return True
-    except subprocess.CalledProcessError, e:
-        if verbose:
-            print(e.output)
-        if &quot;already exists&quot; in e.output:
-            return False
-        raise BootstrapError(
-            &quot;%s failed:\n%s (exit code = %d)&quot; %
-            (CREATEUSER, e.output, e.returncode)
-        )
-
-
-
-def createDatabase(verbose=False):
-    &quot;&quot;&quot;
-    Create the database which calendar server will use within postgres.
-    Return True if database is created, False if database already existed.
-    Raise BootstrapError if there is an issue.
-    &quot;&quot;&quot;
-
-    cmdArgs = [
-        CREATEDB,
-        &quot;-h&quot;, PGSOCKETDIR,
-        &quot;--username=%s&quot; % (USERNAME,),
-        DATABASENAME,
-    ]
-    try:
-        if verbose:
-            print(&quot;\nAttempting to create database...&quot;)
-            print(&quot;Executing: %s&quot; % (&quot; &quot;.join(cmdArgs)))
-        out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
-        if verbose:
-            print(out)
-        return True
-    except subprocess.CalledProcessError, e:
-        if verbose:
-            print(e.output)
-        if &quot;already exists&quot; in e.output:
-            return False
-        raise BootstrapError(
-            &quot;%s failed:\n%s (exit code = %d)&quot; %
-            (CREATEDB, e.output, e.returncode)
-        )
-
-
-
-def getSchemaVersion(verbose=False):
-    &quot;&quot;&quot;
-    Return the version number for the schema installed in the database.
-    Raise BootstrapError if there is an issue.
-    &quot;&quot;&quot;
-
-    cmdArgs = [
-        PSQL,
-        &quot;-h&quot;, PGSOCKETDIR,
-        &quot;-d&quot;, DATABASENAME,
-        &quot;-U&quot;, USERNAME,
-        &quot;-t&quot;,
-        &quot;-c&quot;, &quot;select value from calendarserver where name='VERSION';&quot;,
-    ]
-    try:
-        if verbose:
-            print(&quot;\nAttempting to read schema version...&quot;)
-            print(&quot;Executing: %s&quot; % (&quot; &quot;.join(cmdArgs)))
-        out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
-        if verbose:
-            print(out)
-    except subprocess.CalledProcessError, e:
-        if verbose:
-            print(e.output)
-        raise BootstrapError(
-            &quot;%s failed:\n%s (exit code = %d)&quot; %
-            (PSQL, e.output, e.returncode)
-        )
-
-    try:
-        version = int(out)
-    except ValueError, e:
-        raise BootstrapError(
-            &quot;Failed to parse schema version: %s&quot; % (e,)
-        )
-    return version
-
-
-
-def installSchema(verbose=False):
-    &quot;&quot;&quot;
-    Install the calendar server database schema.
-    Return True if database is created, False if database already existed.
-    Raise BootstrapError if there is an issue.
-    &quot;&quot;&quot;
-
-    cmdArgs = [
-        PSQL,
-        &quot;-h&quot;, PGSOCKETDIR,
-        &quot;-U&quot;, USERNAME,
-        &quot;-f&quot;, SCHEMAFILE,
-    ]
-    try:
-        if verbose:
-            print(&quot;Executing: %s&quot; % (&quot; &quot;.join(cmdArgs)))
-        out = subprocess.check_output(cmdArgs, stderr=subprocess.STDOUT)
-        if verbose:
-            print(out)
-        if &quot;already exists&quot; in out:
-            return False
-        return True
-    except subprocess.CalledProcessError, e:
-        if verbose:
-            print(e.output)
-        raise BootstrapError(
-            &quot;%s failed:\n%s (exit code = %d)&quot; %
-            (PSQL, e.output, e.returncode)
-        )
-
-
-
-class BootstrapError(Exception):
-    pass
-
-
-
-def error(s):
-    sys.stderr.write(&quot;%s\n&quot; % (s,))
-    sys.exit(1)
-
-
-
-def main():
-    try:
-        (optargs, _ignore_args) = getopt(
-            sys.argv[1:], &quot;hv&quot;, [
-                &quot;help&quot;,
-                &quot;verbose&quot;,
-            ],
-        )
-    except GetoptError, e:
-        usage(e)
-
-    verbose = False
-
-    for opt, _ignore_arg in optargs:
-        if opt in (&quot;-h&quot;, &quot;--help&quot;):
-            usage()
-        elif opt in (&quot;-v&quot;, &quot;--verbose&quot;):
-            verbose = True
-        else:
-            raise NotImplementedError(opt)
-
-    # Create the calendar server database user within postgres
-    try:
-        newlyCreated = createUser(verbose=verbose)
-        if newlyCreated:
-            print(&quot;Database user '%s' created&quot; % (USERNAME,))
-        else:
-            print(&quot;Database User '%s' exists&quot; % (USERNAME,))
-    except BootstrapError, e:
-        error(&quot;Failed to create database user '%s': %s&quot; % (USERNAME, e))
-
-    # Create the calendar server database within postgres
-    try:
-        newlyCreated = createDatabase(verbose=verbose)
-        if newlyCreated:
-            print(&quot;Database '%s' created&quot; % (DATABASENAME,))
-        else:
-            print(&quot;Database '%s' exists&quot; % (DATABASENAME,))
-    except BootstrapError, e:
-        error(&quot;Failed to create database '%s': %s&quot; % (DATABASENAME, e))
-
-    # Retrieve the version number of the installed schema
-    try:
-        version = getSchemaVersion(verbose=verbose)
-    except BootstrapError, e:
-        version = 0
-
-    # Retrieve the version number from the schema file
-    try:
-        data = open(SCHEMAFILE).read()
-    except IOError:
-        print(&quot;Unable to open the schema file: %s&quot; % (SCHEMAFILE,))
-    else:
-        found = re.search(&quot;insert into CALENDARSERVER values \('VERSION', '(\d+)'\);&quot;, data)
-        if found is None:
-            print(&quot;Schema is missing required schema VERSION insert statement: %s&quot; % (SCHEMAFILE,))
-        else:
-            required_version = int(found.group(1))
-            if version == required_version:
-                print(&quot;Latest schema version (%d) is installed&quot; % (version,))
-
-            elif version == 0: # No schema installed
-                installSchema(verbose=verbose)
-                version = getSchemaVersion(verbose=verbose)
-                print(&quot;Successfully installed schema version %d&quot; % (version,))
-
-            else: # upgrade needed
-                error(
-                    &quot;Schema needs to be upgraded from %d to %d&quot; %
-                    (version, required_version)
-                )
-
-if __name__ == &quot;__main__&quot;:
-    main()
</del></span></pre></div>
<a id="CalendarServertrunkdoccalendarserver_bootstrap_database8"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/doc/calendarserver_bootstrap_database.8 (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/doc/calendarserver_bootstrap_database.8        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/doc/calendarserver_bootstrap_database.8        2014-03-18 20:11:18 UTC (rev 12948)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-.\&quot;
-.\&quot; Copyright (c) 2011-2014 Apple Inc. All rights reserved.
-.\&quot;
-.\&quot; Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-.\&quot; you may not use this file except in compliance with the License.
-.\&quot; You may obtain a copy of the License at
-.\&quot;
-.\&quot;     http://www.apache.org/licenses/LICENSE-2.0
-.\&quot;
-.\&quot; Unless required by applicable law or agreed to in writing, software
-.\&quot; distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-.\&quot; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-.\&quot; See the License for the specific language governing permissions and
-.\&quot; limitations under the License.
-.\&quot;
-.\&quot; The following requests are required for all man pages.
-.Dd February 14, 2011
-.Dt CALENDARSERVER_BOOTSTRAP_DATABASE 8
-.Os
-.Sh NAME
-.Nm calendarserver_bootstrap_database
-.Nd Calendar Server database bootstrap utility
-.Sh SYNOPSIS
-.Nm
-.Op Fl -verbose
-.Op Fl -help
-.Sh DESCRIPTION
-.Nm
-is a tool which creates the Postgres user Calendar Server will use to
-connect, creates a database, and installs the schema.
-.Pp
-.Nm
-should be run as root.
-.Sh OPTIONS
-.Bl -tag -width flag
-.It Fl h, -help
-Display usage information
-.It Fl v, -verbose
-Print detailed information about what commands are being executed
-.El
-.Sh SEE ALSO
-.Xr caldavd 8
</del></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/setup.py        2014-03-18 20:11:18 UTC (rev 12948)
</span><span class="lines">@@ -237,7 +237,6 @@
</span><span class="cx">         },
</span><span class="cx">         scripts=[
</span><span class="cx">             &quot;bin/caldavd&quot;,
</span><del>-            &quot;bin/py/calendarserver_bootstrap_database&quot;,
</del><span class="cx">             # &quot;bin/py/calendarserver_check_database_schema&quot;,
</span><span class="cx">             &quot;bin/py/calendarserver_command_gateway&quot;,
</span><span class="cx">             &quot;bin/py/calendarserver_config&quot;,
</span></span></pre></div>
<a id="CalendarServertrunksupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/Apple.make (12947 => 12948)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/Apple.make        2014-03-18 20:04:01 UTC (rev 12947)
+++ CalendarServer/trunk/support/Apple.make        2014-03-18 20:11:18 UTC (rev 12948)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx">         @echo &quot;Installing manual pages...&quot;
</span><span class="cx">         $(_v) $(INSTALL_DIRECTORY) &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/caldavd.8&quot;                              &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</span><del>-        $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/calendarserver_bootstrap_database.8&quot;    &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</del><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/calendarserver_command_gateway.8&quot;       &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/calendarserver_export.8&quot;                &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</span><span class="cx">         $(_v) $(INSTALL_FILE) &quot;$(Sources)/doc/calendarserver_manage_principals.8&quot;     &quot;$(DSTROOT)$(SIPP)$(MANDIR)/man8&quot;
</span></span></pre>
</div>
</div>

</body>
</html>