[Python-apps-commits] r7190 - in packages/slapos.core/trunk (30 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Mon Jun 13 08:43:42 UTC 2011
Date: Monday, June 13, 2011 @ 08:43:41
Author: arnau
Revision: 7190
[svn-inject] Applying Debian modifications (0.3~20110608+1.git9496d81-1) to trunk
Added:
packages/slapos.core/trunk/debian/
packages/slapos.core/trunk/debian/README.Debian
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/clean
packages/slapos.core/trunk/debian/compat
packages/slapos.core/trunk/debian/conf/
packages/slapos.core/trunk/debian/conf/slapos.cfg
packages/slapos.core/trunk/debian/config
packages/slapos.core/trunk/debian/control
packages/slapos.core/trunk/debian/copyright
packages/slapos.core/trunk/debian/cron.d
packages/slapos.core/trunk/debian/dirs
packages/slapos.core/trunk/debian/docs
packages/slapos.core/trunk/debian/examples
packages/slapos.core/trunk/debian/patches/
packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch
packages/slapos.core/trunk/debian/patches/series
packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
packages/slapos.core/trunk/debian/po/
packages/slapos.core/trunk/debian/po/POTFILES.in
packages/slapos.core/trunk/debian/po/da.po
packages/slapos.core/trunk/debian/po/sv.po
packages/slapos.core/trunk/debian/po/templates.pot
packages/slapos.core/trunk/debian/postinst
packages/slapos.core/trunk/debian/postrm
packages/slapos.core/trunk/debian/pydist-overrides
packages/slapos.core/trunk/debian/rules
packages/slapos.core/trunk/debian/source/
packages/slapos.core/trunk/debian/source/format
packages/slapos.core/trunk/debian/templates
Property changes on: packages/slapos.core/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/slapos.core/trunk/debian/README.Debian
===================================================================
--- packages/slapos.core/trunk/debian/README.Debian (rev 0)
+++ packages/slapos.core/trunk/debian/README.Debian 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,31 @@
+Bridge configuration
+====================
+
+Before using slapformat commands, you must set up a bridge network interface
+named ``slapbr0''. On that bridge, you must set up at least an IPv6 global
+address, even if it is only a localhost one.
+
+On Debian systems, this is commonly done in ``/etc/network/interfaces'' file.
+
+Note that if you declare any interface as part of the bridge (when you want
+your instances to be available not only on localhost), you should remove them
+from the configuration file.
+
+Here is an example of the bridge on eth0 device with static IPv4 address and
+private IPv6 address:
+
+auto slapbr0
+iface slapbr0 inet static
+ address ADDRESS
+ netmask NETMASK
+ gateway GATEWAY
+ bridge_ports eth0
+
+iface slapbr0 inet6 static
+ address fd00::1
+ netmask 64
+
+You can have a look at bridge-utils-interfaces(5) and interfaces(5) manpages
+for further details.
+
+ -- Arnaud Fontaine <arnau at debian.org>, Fri, 29 Apr 2011 19:19:07 +0900
Added: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog (rev 0)
+++ packages/slapos.core/trunk/debian/changelog 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,14 @@
+slapos.core (0.3~20110608+1.git9496d81-1) unstable; urgency=low
+
+ * debian/po:
+ + Add Swedish translation. Thanks to Martin Bagge. Closes: #628865.
+ + Add Danish translation. Thanks to Joe Dalton. Closes: #628202.
+ * slapos.slap, slapos.tool.grid and slapos.tool.format have been merged
+ upstream into slapos.core.
+ * debian/control, debian/templates:
+ + Improve phrasing. Thanks to Christian Perrier. Closes: #627640.
+ * debian/templates:
+ + Remove meaningless bridge_note debconf note (debconf abuse).
+ Closes: #626091.
+
+ -- Arnaud Fontaine <arnau at debian.org> Mon, 13 Jun 2011 17:41:05 +0900
Added: packages/slapos.core/trunk/debian/clean
===================================================================
--- packages/slapos.core/trunk/debian/clean (rev 0)
+++ packages/slapos.core/trunk/debian/clean 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1 @@
+slapos.core.egg-info/*
\ No newline at end of file
Added: packages/slapos.core/trunk/debian/compat
===================================================================
--- packages/slapos.core/trunk/debian/compat (rev 0)
+++ packages/slapos.core/trunk/debian/compat 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1 @@
+7
Added: packages/slapos.core/trunk/debian/conf/slapos.cfg
===================================================================
--- packages/slapos.core/trunk/debian/conf/slapos.cfg (rev 0)
+++ packages/slapos.core/trunk/debian/conf/slapos.cfg 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,21 @@
+[slapos]
+software_root = /var/lib/slapos/software
+instance_root = /var/lib/slapos/instance
+master_url = http://127.0.0.1:5000
+computer_id = abeautifulbutuniquename
+pidfile = /var/run/slapgrid.pid
+logfile = /var/log/slapos/slapgrid.log
+supervisord-socket = /var/run/slapgrid-supervisord.sock
+#key_file = /etc/slapos/ssl/slapos.key
+#cert_file = /etc/slapos/ssl/slapos.crt
+#certificate_repository_path = /var/cache/slapos/certificates
+
+[slapformat]
+computer_xml = /var/lib/slapos/computer.xml
+log_file = /var/log/slapos/slapformat.log
+partition_amount = 10
+ipv4_local_network = 10.0.0.0/16
+bridge_name = slapbr0
+tap_base_name = slaptap
+partition_base_name = slappart
+user_base_name = slapuser
Added: packages/slapos.core/trunk/debian/config
===================================================================
--- packages/slapos.core/trunk/debian/config (rev 0)
+++ packages/slapos.core/trunk/debian/config 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+CONFIG_FILE=/etc/slapos/slapos.cfg
+
+MASTER_URL=
+COMPUTER_ID=
+PARTITION_AMOUNT=
+IPV4_LOCAL_NETWORK=
+
+if [ -f "$CONFIG_FILE" ]; then
+ MASTER_URL="`sed -ne 's#^\s*master_url[^=]*=\s*\(.*\)$#\1#p' \"$CONFIG_FILE\"`"
+ COMPUTER_ID="`sed -ne 's#^\s*computer_id[^=]*=\s*\(.*\)$#\1#p' \"$CONFIG_FILE\"`"
+ PARTITION_AMOUNT="`sed -ne 's#^\s*partition_amount[^=]*=\s*\(.*\)$#\1#p' \"$CONFIG_FILE\"`"
+ IPV4_LOCAL_NETWORK="`sed -ne 's#^\s*ipv4_local_network_id[^=]*=\s*\(.*\)$#\1#p' \"$CONFIG_FILE\"`"
+fi
+
+if [ -n "$MASTER_URL" ]; then
+ db_set slapos-client/master_url "$MASTER_URL"
+ db_input medium slapos-client/master_url || true
+else
+ db_input high slapos-client/master_url || true
+fi
+
+db_go || true
+db_get slapos-client/master_url
+( echo "$RET" | grep -q "^https://" ) && db_input high slapos-client/master_url_with_ssl_note || true
+
+if [ -n "$COMPUTER_ID" ]; then
+ db_set slapos-client/computer_id "$COMPUTER_ID"
+ db_input medium slapos-client/computer_id || true
+else
+ db_input high slapos-client/computer_id || true
+fi
+
+if [ -n "$PARTITION_AMOUNT" ]; then
+ db_set slapos-client/partition_amount "$PARTITION_AMOUNT"
+ db_input medium slapos-client/partition_amount || true
+else
+ db_input high slapos-client/partition_amount || true
+fi
+
+if [ -n "$IPV4_LOCAL_NETWORK" ]; then
+ db_set slapos-client/ipv4_local_network "$IP4_LOCAL_NETWORK"
+ db_input medium slapos-client/ipv4_local_network || true
+else
+ db_input high slapos-client/ipv4_local_network || true
+fi
+
+db_go || true
+
+exit 0
Property changes on: packages/slapos.core/trunk/debian/config
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control (rev 0)
+++ packages/slapos.core/trunk/debian/control 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,53 @@
+Source: slapos.core
+Maintainer: Arnaud Fontaine <arnau at debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Section: net
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3),
+ python (>= 2.6.6-3~),
+ python2.6,
+ debhelper (>= 7.4.3)
+Build-Depends-Indep: po-debconf
+Standards-Version: 3.9.2
+X-Python-Version: 2.6
+Homepage: http://www.slapos.org
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/slapos.core/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/slapos.core/trunk/
+
+Package: slapos-client
+Architecture: all
+Replaces: python-slapos.slap,
+ slapgrid,
+ slapformat
+Conflicts: python-slapos.slap,
+ slapgrid,
+ slapformat
+Depends: ${misc:Depends},
+ ${python:Depends},
+# slapos.slap
+ python-xmlmarshaller (>= 0.9.3~),
+# slapos.format
+ bridge-utils,
+ uml-utilities,
+# slapos.grid (python 2.6 because of supervisor)
+ python-initgroups,
+ python-argparse,
+ python-zc.buildout (>= 1.5.0)
+Breaks: ${python:Breaks}
+# slapos.grid
+Recommends: libc6-dev | libc-dev,
+ gcc | c-compiler,
+ g++ | c++-compiler,
+ make,
+ python2.6-dev
+Description: Client-side to deploy applications with SlapOS
+ SlapOS allows one to turn any application into SaaS (Service as a System),
+ PaaS (Platform as a Service) or IaaS (Infrastructure as a Service) without
+ loosing your freedom. SlapOS defines two types of servers: SlapOS server and
+ SlapOS client. This package contains libraries and tools to deploy a client.
+ .
+ Slapformat prepares a SlapOS node before running slapgrid. It then generates
+ a report and sends the information to the configured SlapOS master.
+ .
+ Slapgrid allows you to easily deploy instances of software based on buildout
+ profiles.
Added: packages/slapos.core/trunk/debian/copyright
===================================================================
--- packages/slapos.core/trunk/debian/copyright (rev 0)
+++ packages/slapos.core/trunk/debian/copyright 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,77 @@
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: slapos.core
+Upstream-Contact: Vifib SARL <info at slapos.org>
+Source: http://git.erp5.org/repos/slapos.core.git
+
+Files: *
+Copyright: 2010-2011, Vifib SARL and Contributors
+License: GPL-3
+ 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.
+ .
+ On Debian systems the complete text of the GNU General Public License v3 can
+ be found in the file `/usr/share/common-licenses/GPL-3'.
+
+Files: slapos/grid/zc.buildout-bootstap.py
+Copyright: 2006 Zope Foundation and Contributors
+License: ZPL-2.1
+ Zope Public License (ZPL) Version 2.1
+
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+
+ This license has been certified as open source. It has also been designated
+ as GPL compatible by the Free Software Foundation (FSF).
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from
+ the copyright holders.
+
+ 4. The right to distribute this software or to use it for any purpose does
+ not give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright holders. Use of them is covered by separate agreement with the
+ copyright holders.
+
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+
+ Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2011, Arnaud Fontaine <arnau at debian.org>
+License: GPL-3
Added: packages/slapos.core/trunk/debian/cron.d
===================================================================
--- packages/slapos.core/trunk/debian/cron.d (rev 0)
+++ packages/slapos.core/trunk/debian/cron.d 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,8 @@
+SHELL=/bin/sh
+PATH=/usr/bin:/usr/sbin:/sbin:/bin
+MAILTO=root
+
+*/5 * * * * root /usr/sbin/slapgrid-cp
+*/5 * * * * root /usr/sbin/slapgrid-sr
+0 0 * * * root /usr/sbin/slapgrid-ur
+0 0 * * * root /usr/sbin/slapformat
Added: packages/slapos.core/trunk/debian/dirs
===================================================================
--- packages/slapos.core/trunk/debian/dirs (rev 0)
+++ packages/slapos.core/trunk/debian/dirs 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,6 @@
+etc/slapos/
+etc/slapos/ssl/
+var/log/slapos/
+var/lib/slapos/software/
+var/lib/slapos/instance/
+var/cache/slapos/certificates/
Added: packages/slapos.core/trunk/debian/docs
===================================================================
--- packages/slapos.core/trunk/debian/docs (rev 0)
+++ packages/slapos.core/trunk/debian/docs 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,5 @@
+slapos/README.format.txt
+slapos/README.grid.txt
+slapos/README.libnetworkcache.txt
+slapos/README.slap.txt
+debian/README.Debian
Added: packages/slapos.core/trunk/debian/examples
===================================================================
--- packages/slapos.core/trunk/debian/examples (rev 0)
+++ packages/slapos.core/trunk/debian/examples 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,2 @@
+debian/conf/slapos.cfg
+computer_definition.cfg.example
Added: packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch (rev 0)
+++ packages/slapos.core/trunk/debian/patches/fix_python26_missing_initgroups.patch 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,31 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+Description: os.initgroups is only available on Python >= 2.7
+ Rely instead on initgroups from Zope project which provides exactly
+ the same API.
+
+--- a/slapos/grid/utils.py 2011-06-10 11:45:33.092000207 +0900
++++ b/slapos/grid/utils.py 2011-06-10 11:46:07.668000208 +0900
+@@ -36,6 +36,13 @@
+ from exception import BuildoutFailedError, WrongPermissionError
+ from hashlib import md5
+
++try:
++ # Python 2.7 only
++ from os import initgroups
++except:
++ # Otherwise, fallback on Zope initgroups
++ from initgroups import initgroups
++
+ # Such umask by default will create paths with full permission
+ # for user, non writable by group and not accessible by others
+ SAFE_UMASK = 027
+@@ -180,7 +187,7 @@
+ user_name = pwd.getpwuid(uid)[0]
+ group_list = [x.gr_gid for x in grp.getgrall() if user_name in x.gr_mem]
+ group_list.append(gid)
+- os.initgroups(pwd.getpwuid(uid)[0], gid)
++ initgroups(pwd.getpwuid(uid)[0], gid)
+ os.setgid(gid)
+ os.setuid(uid)
+
Added: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series (rev 0)
+++ packages/slapos.core/trunk/debian/patches/series 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,2 @@
+system_configuration_file_by_default.patch
+fix_python26_missing_initgroups.patch
Added: packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch (rev 0)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,61 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+Description: Fallback on system configuration file by default
+ Scripts expect the configuration file as their first argument, but as
+ the configuration file options are set up through debconf, fallback
+ on /etc/slapos/slapos.cfg generated upon package installation.
+
+Index: slapos.core-0.3~20110608+1.git9496d81.orig/slapos/format/__init__.py
+===================================================================
+--- slapos.core-0.3~20110608+1.git9496d81.orig.orig/slapos/format/__init__.py 2011-06-10 11:46:28.548000207 +0900
++++ slapos.core-0.3~20110608+1.git9496d81.orig/slapos/format/__init__.py 2011-06-10 11:48:32.000000000 +0900
+@@ -715,8 +715,10 @@
+ """
+ (options, args) = self.parse_args()
+ if len(args) != 1:
+- self.error("Incorrect number of arguments")
+- return options, args[0]
++ configuration_file = '/etc/slapos/slapos.cfg'
++ else:
++ configuration_file = args[0]
++ return options, configuration_file
+
+ def run(config):
+ try:
+@@ -944,7 +946,11 @@
+
+ def main():
+ "Run default configuration."
+- usage = "usage: %s [options] CONFIGURATION_FILE" % sys.argv[0]
++ usage = """usage: %s [options] CONFIGURATION_FILE
++
++If CONFIGURATION_FILE is not given explicitly, it fallbacks on
++`/etc/slapos/slapos.cfg'.
++""" % sys.argv[0]
+
+ try:
+ # Parse arguments
+Index: slapos.core-0.3~20110608+1.git9496d81.orig/slapos/grid/slapgrid.py
+===================================================================
+--- slapos.core-0.3~20110608+1.git9496d81.orig.orig/slapos/grid/slapgrid.py 2011-06-10 11:46:28.564000207 +0900
++++ slapos.core-0.3~20110608+1.git9496d81.orig/slapos/grid/slapgrid.py 2011-06-10 17:04:30.312000549 +0900
+@@ -103,8 +103,8 @@
+ help="Enables console output and live output from subcommands.")
+ parser.add_argument("-v", "--verbose", action="store_true", default=False,
+ help="Be verbose.")
+- parser.add_argument("configuration_file", nargs=1, type=argparse.FileType(),
+- help="SlapOS configuration file.")
++ parser.add_argument("configuration_file", nargs='?', type=argparse.FileType(),
++ default='/etc/slapos/slapos.cfg', help="SlapOS configuration file.")
+
+ # Parses arguments
+ if argument_tuple == ():
+@@ -115,7 +115,7 @@
+ parser.parse_args(list(argument_tuple))
+ # Parses arguments from config file, if needed, then merge previous arguments
+ option_dict = {}
+- configuration_file = argument_option_instance.configuration_file[0]
++ configuration_file = argument_option_instance.configuration_file
+ # Loads config (if config specified)
+ slapgrid_configuration = ConfigParser.SafeConfigParser()
+ slapgrid_configuration.readfp(configuration_file)
Added: packages/slapos.core/trunk/debian/po/POTFILES.in
===================================================================
--- packages/slapos.core/trunk/debian/po/POTFILES.in (rev 0)
+++ packages/slapos.core/trunk/debian/po/POTFILES.in 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
Added: packages/slapos.core/trunk/debian/po/da.po
===================================================================
--- packages/slapos.core/trunk/debian/po/da.po (rev 0)
+++ packages/slapos.core/trunk/debian/po/da.po 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,98 @@
+# Danish translation slapos.tool.format.
+# Copyright (C) slapos.tool.format & nedenstående oversættere.
+# This file is distributed under the same license as the slapos.tool.format package.
+# Joe Hansen (joedalton2 at yahoo.dk), 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slapos.tool.format\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"PO-Revision-Date: 2011-06-12 18:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr "SlapOS' adresse for overknude:"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr "Nøgle for overknude og certifikat er krævet"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+"Du brugte en HTTPS URL for SlapOS' overknude, så det tilsvarende certifikat "
+"skal placeres i /etc/slapos/ssl/slapos.crt, og nøglen i /etc/slapos/ssl/"
+"slapos.key, kun læsbart for administrator (root)."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "SlapOS computer ID:"
+msgstr "Computer-id for SlapOS:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr "Angiv venligst en unik identifikator for denne SlapOS-knude."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Number of Computer Partitions on this computer:"
+msgstr "Antal computerpartitioner på denne computer:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+"En computerpartition (CP) er en instans af en programudgivelse (SR). Du kan "
+"nu definere hvor mange instanser, som vil være tilgængelige på denne "
+"computer."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+"Bemærk at programudgivelser vil blive gemt i /var/lib/slapos/software/, "
+"hvorimod computerpartitionen vil blive gemt i /var/lib/slapos/instance/."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr "Lokalt IPv4-netværk som skal bruges for computerpartitioner:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
+"Alle computerpartitioner skal have en adresse på det samme IPv4-netværk. "
+"Angiv venligst et netværk i CIDR-notation (det vil sige: 192.0.2.0/24)."
+
+
Added: packages/slapos.core/trunk/debian/po/sv.po
===================================================================
--- packages/slapos.core/trunk/debian/po/sv.po (rev 0)
+++ packages/slapos.core/trunk/debian/po/sv.po 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,114 @@
+# Translation of slapos.tool.format debconf template to Swedish
+# Copyright (C) 2011 Martin Bagge <brother at bsnet.se>
+# This file is distributed under the same license as the slapos.tool.format package.
+#
+# Martin Bagge <brother at bsnet.se>, 2011
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"PO-Revision-Date: 2011-06-12 17:20+0100\n"
+"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: Swedish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr "URL till SlapOS huvudnod:"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr "Huvudnod-nyckel och certifikat behövs"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+"Du använde en HTTPS URL för SlapOS huvudnod, motsvarande certifikat måste "
+"placeras i /etc/slapos/ssl/slapos.crt och nyckeln i /etc/slapos/ssl/slapos."
+"key, dessa ska endast vara läsbara av root."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+#| msgid "SlapOS client ID:"
+msgid "SlapOS computer ID:"
+msgstr "SlapOS dator-ID:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr "Ange en unik identifiering för denna SlapOS-nod."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Number of Computer Partitions on this computer:"
+msgstr "Antal datorpartitioner på denna dator:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+"En datorpartition (CP) är en instans av en mjukvaruutgåva (SR). Du kan nu "
+"ange hur många instanser du vill ska vara tillgängliga på denna dator."
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+"Kom ihåg att mjukvaruutgåvor kommer att lagras i /var/lib/slapos/software/, "
+"datorpartitioner lagras i /var/lib/slapos/instance/."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr "Lokalt IPv4-nätverk som ska användas för datorpartitioner:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
+"Varje datorpartition måste ha en adress på samma IPv4-nätverk. Ange ett "
+"nätverk med CIDR-notation (ex. 192.0.2.0/24)."
+
+#~ msgid "Network configuration note"
+#~ msgstr "Om nätverkskonfiguration"
+
+#~ msgid ""
+#~ "Before using the slapformat script, you must set up a network bridge to "
+#~ "be used by the Computer Partitions, and ensure IPv6 is enabled."
+#~ msgstr ""
+#~ "Innan du använder slapformatskriptet måste du lägga till en "
+#~ "nätverksbrygga som ska användas av datorpartitionerna och säkerställa att "
+#~ "IPv6 är aktiverat."
+
+#~ msgid ""
+#~ "You can find more information in /usr/share/doc/slapformat/README.Debian."
+#~ msgstr ""
+#~ "Du kan hitta mer information i /usr/share/doc/slapformat/README.Debian."
Added: packages/slapos.core/trunk/debian/po/templates.pot
===================================================================
--- packages/slapos.core/trunk/debian/po/templates.pot (rev 0)
+++ packages/slapos.core/trunk/debian/po/templates.pot 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,87 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
+"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "SlapOS master node URL:"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Master node key and certificate mandatory"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"You used an HTTPS URL for the SlapOS master node, so the corresponding "
+"certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key in /"
+"etc/slapos/ssl/slapos.key, readable only to root."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "SlapOS computer ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Please specify a unique identifier for this SlapOS node."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Number of Computer Partitions on this computer:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"A Computer Partition (CP) is an instance of a Software Release (SR). You can "
+"now define how many instances will be available on this computer."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"Note that the Software Releases will be stored in /var/lib/slapos/software/, "
+"whereas the Computer Partition will be stored in /var/lib/slapos/instance/."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Local IPv4 network to be used for Computer Partitions:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Every Computer Partition must have an address on the same IPv4 network. "
+"Please specify a network in CIDR notation (e.g.: 192.0.2.0/24)."
+msgstr ""
Added: packages/slapos.core/trunk/debian/postinst
===================================================================
--- packages/slapos.core/trunk/debian/postinst (rev 0)
+++ packages/slapos.core/trunk/debian/postinst 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+CONFIG_FILE=/etc/slapos/slapos.cfg
+if [ ! -f "$CONFIG_FILE" ]; then
+ echo "# Never edit this file by hand as it has been automatically generated by
+# debconf. You can change the settings at any time by running:
+# ``dpkg-reconfigure -pmedium slapformat''" > /etc/slapos/slapos.cfg
+
+ cat < /usr/share/doc/slapos-client/examples/slapos.cfg >> /etc/slapos/slapos.cfg
+fi
+
+db_get slapos-client/master_url
+MASTER_URL="$RET"
+WITH_HTTPS=$(echo "$MASTER_URL" | grep -q "^https://" && echo true || echo false)
+
+db_get slapos-client/computer_id
+COMPUTER_ID="$RET"
+
+sed -e "s#^\s*master_url\s*=.*#master_url = $MASTER_URL#" \
+ -e "s#^\s*computer_id\s*=.*#computer_id = $COMPUTER_ID#" \
+ -i $CONFIG_FILE
+
+# Handle HTTPS URLs by just commenting/uncommenting the relevant lines
+if $WITH_HTTPS; then
+ sed -i 's/^\s*#\+\s*\(key_file\|cert_file\|certificate_repository_path\)/\1/' \
+ $CONFIG_FILE
+else
+ sed -i 's/^\s*[^#]*\s*\(key_file\|cert_file\|certificate_repository_path\)/#\1/' \
+ $CONFIG_FILE
+fi
+
+db_get slapos-client/partition_amount
+PARTITION_AMOUNT="$RET"
+
+db_get slapos-client/ipv4_local_network
+IPV4_LOCAL_NETWORK="$RET"
+
+sed -e "s#^\s*partition_amount\s*=.*#partition_amount = $PARTITION_AMOUNT#" \
+ -e "s#^\s*ipv4_local_network\s*=.*#ipv4_local_network = $IPV4_LOCAL_NETWORK#" \
+ -i $CONFIG_FILE
+
+exit 0
Property changes on: packages/slapos.core/trunk/debian/postinst
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/slapos.core/trunk/debian/postrm
===================================================================
--- packages/slapos.core/trunk/debian/postrm (rev 0)
+++ packages/slapos.core/trunk/debian/postrm 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+ purge)
+ rm -rf /var/log/slapos/ /var/lib/slapos/ /var/cache/slapos/certificates/ \
+ /etc/slapos/
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Property changes on: packages/slapos.core/trunk/debian/postrm
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/slapos.core/trunk/debian/pydist-overrides
===================================================================
--- packages/slapos.core/trunk/debian/pydist-overrides (rev 0)
+++ packages/slapos.core/trunk/debian/pydist-overrides 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,2 @@
+setuptools python-pkg-resources, python-setuptools
+xml_marshaller python-xmlmarshaller
Added: packages/slapos.core/trunk/debian/rules
===================================================================
--- packages/slapos.core/trunk/debian/rules (rev 0)
+++ packages/slapos.core/trunk/debian/rules 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@ --with python2
+
+override_dh_auto_install:
+ python2.6 setup.py install --root=debian/slapos-client --install-layout=deb \
+ --install-scripts=/usr/sbin/
+
+# Generate the upstream tarball from upstream Git (adapted from
+# http://wiki.debian.org/SandroTosi/Svn_get-orig-source for Git)
+PACKAGE := $(shell dpkg-parsechangelog | \
+ sed -ne 's/^Source: \([a-z.]*\).*/\1/p')
+
+SRC_VERSION := $(shell dpkg-parsechangelog | \
+ sed -ne 's/^Version: \([^-]\+\)-.*/\1/p')
+
+GIT_VERSION := $(shell echo $(SRC_VERSION) | \
+ sed -ne 's/.*git\([a-z0-9]\+\)/\1/p')
+
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+
+get-orig-source:
+ rm -rf get-orig-source $(TARBALL)
+
+ git clone http://git.erp5.org/repos/slapos.core.git \
+ get-orig-source/
+
+ cd get-orig-source/ && \
+ git archive --prefix=$(PACKAGE)-$(SRC_VERSION).orig/ \
+ --format=tar $(GIT_VERSION) `/bin/ls | grep -v master` | \
+ gzip --no-name --best > ../../$(TARBALL)
+
+ rm -rf get-orig-source
+ @echo "'$(TARBALL)' created."
+
+.PHONY: get-orig-source
Property changes on: packages/slapos.core/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/slapos.core/trunk/debian/source/format
===================================================================
--- packages/slapos.core/trunk/debian/source/format (rev 0)
+++ packages/slapos.core/trunk/debian/source/format 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/slapos.core/trunk/debian/templates
===================================================================
--- packages/slapos.core/trunk/debian/templates (rev 0)
+++ packages/slapos.core/trunk/debian/templates 2011-06-13 08:43:41 UTC (rev 7190)
@@ -0,0 +1,41 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: slapos-client/master_url
+Type: string
+_Description: SlapOS master node URL:
+
+Template: slapos-client/master_url_with_ssl_note
+Type: note
+_Description: Master node key and certificate mandatory
+ You used an HTTPS URL for the SlapOS master node, so the corresponding
+ certificate must be placed in /etc/slapos/ssl/slapos.crt, and the key
+ in /etc/slapos/ssl/slapos.key, readable only to root.
+
+Template: slapos-client/computer_id
+Type: string
+_Description: SlapOS computer ID:
+ Please specify a unique identifier for this SlapOS node.
+
+Template: slapos-client/partition_amount
+Type: string
+_Description: Number of Computer Partitions on this computer:
+ A Computer Partition (CP) is an instance of a Software Release
+ (SR). You can now define how many instances will be available on this
+ computer.
+ .
+ Note that the Software Releases will be stored in
+ /var/lib/slapos/software/, whereas the Computer Partition will be
+ stored in /var/lib/slapos/instance/.
+
+Template: slapos-client/ipv4_local_network
+Type: string
+_Description: Local IPv4 network to be used for Computer Partitions:
+ Every Computer Partition must have an address on the same IPv4 network.
+ Please specify a network in CIDR notation (e.g.: 192.0.2.0/24).
More information about the Python-apps-commits
mailing list