[Python-apps-commits] r7257 - in packages/slapos.core/trunk/debian (16 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Fri Jul 1 13:11:36 UTC 2011 

    Date: Friday, July 1, 2011 @ 13:11:34
  Author: arnau
Revision: 7257

* Allow to specify  the software release root through  debconf, necessary when
  using a  SlapOS master (it must  be the same independently  of the GNU/Linux
  distribution).
* Fix typo on ipv4_local_network name, which was not set properly in generated
  /etc/slapos/slapos.cfg file.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/config
  packages/slapos.core/trunk/debian/dirs
  packages/slapos.core/trunk/debian/po/cs.po
  packages/slapos.core/trunk/debian/po/da.po
  packages/slapos.core/trunk/debian/po/es.po
  packages/slapos.core/trunk/debian/po/fr.po
  packages/slapos.core/trunk/debian/po/ja.po
  packages/slapos.core/trunk/debian/po/nl.po
  packages/slapos.core/trunk/debian/po/pt.po
  packages/slapos.core/trunk/debian/po/ru.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/templates

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/changelog	2011-07-01 13:11:34 UTC (rev 7257)
@@ -1,3 +1,14 @@
+slapos.core (0.8-2) UNRELEASED; urgency=low
+
+   * Allow to specify the software release root through debconf, necessary
+     when using a SlapOS master (it must be the  same independently of the
+     GNU/Linux distribution).
+   * debian/config:
+     + Fix typo on ipv4_local_network  name, which was not set properly in
+       generated /etc/slapos/slapos.cfg file.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 01 Jul 2011 14:51:46 +0200
+
 slapos.core (0.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/slapos.core/trunk/debian/config
===================================================================
--- packages/slapos.core/trunk/debian/config	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/config	2011-07-01 13:11:34 UTC (rev 7257)
@@ -9,14 +9,16 @@
 
 MASTER_URL=
 COMPUTER_ID=
+SOFTWARE_ROOT=
 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\"`"
+    SOFTWARE_ROOT="`sed -ne 's#^\s*software_root[^=]*=\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\"`"
+    IPV4_LOCAL_NETWORK="`sed -ne 's#^\s*ipv4_local_network[^=]*=\s*\(.*\)$#\1#p' \"$CONFIG_FILE\"`"
 fi
 
 if [ -n "$MASTER_URL" ]; then
@@ -37,6 +39,13 @@
     db_input high slapos-client/computer_id || true
 fi
 
+if [ -n "$SOFTWARE_ROOT" ]; then
+    db_set slapos-client/software_root "$SOFTWARE_ROOT"
+    db_input medium slapos-client/software_root || true
+else
+    db_input high slapos-client/software_root || true
+fi
+
 if [ -n "$PARTITION_AMOUNT" ]; then
     db_set slapos-client/partition_amount "$PARTITION_AMOUNT"
     db_input medium slapos-client/partition_amount || true
@@ -45,7 +54,7 @@
 fi
 
 if [ -n "$IPV4_LOCAL_NETWORK" ]; then
-    db_set slapos-client/ipv4_local_network "$IP4_LOCAL_NETWORK"
+    db_set slapos-client/ipv4_local_network "$IPV4_LOCAL_NETWORK"
     db_input medium slapos-client/ipv4_local_network || true
 else
     db_input high slapos-client/ipv4_local_network || true

Modified: packages/slapos.core/trunk/debian/dirs
===================================================================
--- packages/slapos.core/trunk/debian/dirs	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/dirs	2011-07-01 13:11:34 UTC (rev 7257)
@@ -1,7 +1,6 @@
 etc/slapos/
 etc/slapos/ssl/
 var/log/slapos/
-var/lib/slapos/software/
 var/lib/slapos/instance/
 var/cache/slapos/certificates/
 usr/bin/

Modified: packages/slapos.core/trunk/debian/po/cs.po
===================================================================
--- packages/slapos.core/trunk/debian/po/cs.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/cs.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slapos-client\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-13 17:31+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -55,12 +55,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Počet oddílů počítače na tomto počítači:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -70,7 +86,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -80,13 +96,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Místní IPv4 síť, která se má použít pro oddíly počítače:"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/da.po
===================================================================
--- packages/slapos.core/trunk/debian/po/da.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/da.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slapos-client\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\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"
@@ -55,12 +55,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Antal computerpartitioner på denne computer:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -71,7 +87,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -81,18 +97,16 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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
+#: ../templates:7001
 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)."
-
-

Modified: packages/slapos.core/trunk/debian/po/es.po
===================================================================
--- packages/slapos.core/trunk/debian/po/es.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/es.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -28,7 +28,7 @@
 msgstr ""
 "Project-Id-Version: slapos.tool.format 1.0~20110420+1.git67c5b39-2\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-14 09:30+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org >\n"
@@ -77,12 +77,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Número de «particiones de equipo» en este equipo:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -93,7 +109,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -104,13 +120,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Red local IPv4 que se utilizará para las «particiones de equipo»:"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/fr.po
===================================================================
--- packages/slapos.core/trunk/debian/po/fr.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/fr.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slapos.tool\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-13 13:27+0100\n"
 "Last-Translator: Julien Patriarca <patriarcaj at gmail.com>\n"
 "Language-Team: FRENCH <debian-l10n-french at lists.debian.org>\n"
@@ -56,12 +56,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Nombre de « Partitions Ordinateur » présentes sur cette machine :"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -72,7 +88,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -83,13 +99,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Réseau IPV4 à utiliser pour les « Partitions d'Ordinateur » :"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/ja.po
===================================================================
--- packages/slapos.core/trunk/debian/po/ja.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/ja.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: slapos.tool.format 1.0~20110420+1.git67c5b39-2\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-14 23:07+0900\n"
 "Last-Translator: Hideki Yamane <henrich at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -54,12 +54,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "このコンピューター上のコンピューターパーティション数:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -70,7 +86,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -80,13 +96,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "コンピューターパーティションに使うローカル IPv4 ネットワーク:"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."
@@ -94,4 +110,3 @@
 "すべてのコンピューターパーティションは同じ IPv4 ネットワーク上のアドレスを持"
 "つ必要があります。ネットワークを CIDR 記法で指定してください (例: "
 "192.0.2.0/24)"
-

Modified: packages/slapos.core/trunk/debian/po/nl.po
===================================================================
--- packages/slapos.core/trunk/debian/po/nl.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/nl.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slapos.tool.format 1.0~20110420+1.git67c5b39-2\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-14 08:29+0200\n"
 "Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -56,12 +56,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Het aantal computerpartities op deze computer:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -72,7 +88,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -82,13 +98,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Lokaal IPv4-netwerk voor de computerpartities:"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/pt.po
===================================================================
--- packages/slapos.core/trunk/debian/po/pt.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/pt.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slapos-client\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-13 13:23+0100\n"
 "Last-Translator: Rui Branco <ruipb at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -56,12 +56,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Número de Partições de Computador neste computador:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -72,7 +88,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -83,13 +99,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Rede IPv4 local a ser usada pelas 'Computer Partitions':"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/ru.po
===================================================================
--- packages/slapos.core/trunk/debian/po/ru.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/ru.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: slapos.tool.format new\n"
 "Report-Msgid-Bugs-To: slapos.core at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-10 11:29+0900\n"
+"POT-Creation-Date: 2011-07-01 11:13+0200\n"
 "PO-Revision-Date: 2011-06-14 20:03+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -57,12 +57,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Количество Computer Partition на этом компьютере:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -72,7 +88,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -82,13 +98,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr "Локальная сеть IPv4, которая будет использована на Computer Partition:"
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/sv.po
===================================================================
--- packages/slapos.core/trunk/debian/po/sv.po	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/sv.po	2011-07-01 13:11:34 UTC (rev 7257)
@@ -7,7 +7,7 @@
 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"
+"POT-Creation-Date: 2011-07-01 11:13+0200\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"
@@ -57,12 +57,28 @@
 #. Type: string
 #. Description
 #: ../templates:5001
+msgid "Software Releases root directory:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
 msgid "Number of Computer Partitions on this computer:"
 msgstr "Antal datorpartitioner på denna dator:"
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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."
@@ -72,7 +88,7 @@
 
 #. Type: string
 #. Description
-#: ../templates:5001
+#: ../templates:6001
 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/."
@@ -82,13 +98,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/po/templates.pot
===================================================================
--- packages/slapos.core/trunk/debian/po/templates.pot	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/po/templates.pot	2011-07-01 13:11:34 UTC (rev 7257)
@@ -8,7 +8,7 @@
 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"
+"POT-Creation-Date: 2011-07-01 11:13+0200\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"
@@ -53,20 +53,36 @@
 #. Type: string
 #. Description
 #: ../templates:5001
-msgid "Number of Computer Partitions on this computer:"
+msgid "Software Releases root directory:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../templates:5001
 msgid ""
+"If you intend to use this package only for development, then /var/lib/slapos/"
+"software is a sensible choice, however, when using a master with network "
+"cache, it is highly recommended to use the same path on all the nodes, for "
+"example /opt/slapgrid."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Number of Computer Partitions on this computer:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:6001
+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
+#: ../templates:6001
 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/."
@@ -74,13 +90,13 @@
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 msgid "Local IPv4 network to be used for Computer Partitions:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:6001
+#: ../templates:7001
 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)."

Modified: packages/slapos.core/trunk/debian/postinst
===================================================================
--- packages/slapos.core/trunk/debian/postinst	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/postinst	2011-07-01 13:11:34 UTC (rev 7257)
@@ -34,13 +34,17 @@
 	$CONFIG_FILE
 fi
 
+db_get slapos-client/software_root
+SOFTWARE_ROOT="$RET"
+
 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#" \
+sed -e "s#^\s*software_root\s*=.*#software_root = $SOFTWARE_ROOT#" \
+    -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
 

Modified: packages/slapos.core/trunk/debian/postrm
===================================================================
--- packages/slapos.core/trunk/debian/postrm	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/postrm	2011-07-01 13:11:34 UTC (rev 7257)
@@ -1,10 +1,15 @@
 #!/bin/sh
 set -e
 
+. /usr/share/debconf/confmodule
+
 case "$1" in
     purge)
+        db_get slapos-client/software_root
+        SOFTWARE_ROOT="$RET"
+
         rm -rf /var/log/slapos/ /var/lib/slapos/ /var/cache/slapos/certificates/ \
-            /etc/slapos/
+            /etc/slapos/ "$SOFTWARE_ROOT"
 	;;
 esac
 

Modified: packages/slapos.core/trunk/debian/templates
===================================================================
--- packages/slapos.core/trunk/debian/templates	2011-06-30 17:14:07 UTC (rev 7256)
+++ packages/slapos.core/trunk/debian/templates	2011-07-01 13:11:34 UTC (rev 7257)
@@ -23,6 +23,14 @@
 _Description: SlapOS computer ID:
  Please specify a unique identifier for this SlapOS node.
 
+Template: slapos-client/software_root
+Type: string
+_Description: Software Releases root directory:
+ If you intend to use this package only for development, then
+ /var/lib/slapos/software is a sensible choice, however, when using a master
+ with network cache, it is highly recommended to use the same path on all the
+ nodes, for example /opt/slapgrid.
+
 Template: slapos-client/partition_amount
 Type: string
 _Description: Number of Computer Partitions on this computer:
@@ -36,6 +44,7 @@
 
 Template: slapos-client/ipv4_local_network
 Type: string
+Default: 10.0.0.0/16
 _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