[Python-apps-commits] r10924 - in packages/slapos.core/trunk/debian (6 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Wed Jun 11 05:52:56 UTC 2014
Date: Wednesday, June 11, 2014 @ 05:52:55
Author: arnau
Revision: 10924
NUR: Upload slapos.core 1.2.1.
Modified:
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
packages/slapos.core/trunk/debian/slapos-client.install
packages/slapos.core/trunk/debian/slapos-node-unofficial.install
Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/changelog 2014-06-11 05:52:55 UTC (rev 10924)
@@ -1,3 +1,11 @@
+slapos.core (1.1.2-1) unstable; urgency=low
+
+ * New upstream release.
+ + debian/patches: Refreshed.
+ + debian/slapos-node-unofficial.install: New collect/boot subcommand.
+
+ -- Arnaud Fontaine <arnau at debian.org> Wed, 11 Jun 2014 14:22:52 +0900
+
slapos.core (1.0.3-2) unstable; urgency=medium
* debian/patches/fix_static_opt_path.patch:
Modified: packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch 2014-06-11 05:52:55 UTC (rev 10924)
@@ -4,7 +4,7 @@
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
-@@ -68,7 +68,7 @@
+@@ -70,7 +70,7 @@
PROMISE_TIMEOUT = 3
# XXX hardcoded watchdog_path
Modified: packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/patches/slapos_command_split_up.patch 2014-06-11 05:52:55 UTC (rev 10924)
@@ -6,7 +6,7 @@
--- a/slapos/cli/entry.py
+++ b/slapos/cli/entry.py
-@@ -44,7 +44,15 @@
+@@ -71,7 +71,15 @@
name = '%s %s' % (name, next_val) if name else next_val
if name in self.commands:
cmd_ep = self.commands[name]
@@ -23,7 +23,7 @@
return (cmd_factory, name, search_args)
else:
LOG.critical('slapos: the command %r does not exist or is not yet implemented.\n'
-@@ -70,8 +78,15 @@
+@@ -97,8 +105,15 @@
command_manager = app.command_manager
groups = collections.defaultdict(list)
for name, ep in sorted(command_manager):
@@ -41,7 +41,7 @@
for group in sorted(groups):
app.stdout.write('\n%s commands:\n' % group)
-@@ -79,20 +94,6 @@
+@@ -106,20 +121,6 @@
app.stdout.write(line)
sys.exit(0)
Modified: packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/patches/system_configuration_file_by_default.patch 2014-06-11 05:52:55 UTC (rev 10924)
@@ -8,7 +8,7 @@
--- a/slapos/cli/config.py
+++ b/slapos/cli/config.py
-@@ -18,7 +18,7 @@
+@@ -45,7 +45,7 @@
default_config_var = 'SLAPOS_CONFIGURATION'
# use this if default_config_var does not exist
@@ -17,7 +17,7 @@
def get_parser(self, prog_name):
ap = super(ConfigCommand, self).get_parser(prog_name)
-@@ -32,8 +32,17 @@
+@@ -59,8 +59,17 @@
if args.cfg:
cfg_path = args.cfg
else:
@@ -37,7 +37,7 @@
def fetch_config(self, args):
"""
-@@ -47,9 +56,6 @@
+@@ -74,9 +83,6 @@
self.app.log.debug('Loading config: %s', cfg_path)
@@ -47,7 +47,7 @@
configp = ConfigParser.SafeConfigParser()
if configp.read(cfg_path) != [cfg_path]:
# bad permission, etc.
-@@ -64,5 +70,6 @@
+@@ -91,5 +97,6 @@
"""
default_config_var = 'SLAPOS_CLIENT_CONFIGURATION'
@@ -57,7 +57,7 @@
command_group = 'client'
--- a/slapos/cli/register.py
+++ b/slapos/cli/register.py
-@@ -156,8 +156,8 @@
+@@ -182,8 +182,8 @@
def save_former_config(conf):
"""Save former configuration if found"""
@@ -68,23 +68,23 @@
return
saved = former + '.old'
-@@ -174,13 +174,11 @@
+@@ -200,13 +200,10 @@
def fetch_configuration_template():
-- req = requests.get('http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos.cfg.example')
-- req.raise_for_status()
-- return req.text
+- template_arg_list = (__name__.split('.')[0], 'slapos.cfg.example')
+- with pkg_resources.resource_stream(*template_arg_list) as fout:
+- slapos_node_configuration_template = fout.read()
+- return slapos_node_configuration_template
+ return open('/etc/slapos/slapos-node-unofficial.cfg').read().decode('utf-8')
-
def slapconfig(conf):
- """Base Function to configure slapos in /etc/opt/slapos"""
+ """Base Function to configure slapos in /etc/slapos"""
dry_run = conf.dry_run
# Create slapos configuration directory if needed
slap_conf_dir = os.path.normpath(conf.slapos_configuration)
-@@ -213,8 +211,8 @@
+@@ -232,8 +229,8 @@
if not dry_run:
os.mkdir(user_certificate_repository_path, 0o711)
@@ -95,7 +95,7 @@
for src, dst in [(conf.key, key_file), (conf.certificate, cert_file)]:
conf.logger.info('Copying to %r, and setting minimum privileges', dst)
-@@ -224,16 +222,14 @@
+@@ -243,16 +240,14 @@
os.chmod(dst, 0o600)
os.chown(dst, 0, 0)
@@ -114,7 +114,7 @@
cfg = fetch_configuration_template()
to_replace = [
-@@ -304,7 +300,7 @@
+@@ -323,7 +318,7 @@
def do_register(conf):
@@ -123,7 +123,7 @@
if conf.login or conf.login_auth:
for login, password in gen_auth(conf):
-@@ -332,17 +328,14 @@
+@@ -351,14 +346,11 @@
COMP = get_computer_name(certificate)
# Getting configuration parameters
@@ -139,7 +139,3 @@
# Prepare Slapos Configuration
slapconfig(conf)
- conf.logger.info('Node has successfully been configured as %s.', COMP)
-- conf.logger.info('Now please invoke /usr/sbin/slapos-start on your site.')
-+ conf.logger.info('Now please invoke /usr/bin/slapos node start on your site.')
- return 0
Modified: packages/slapos.core/trunk/debian/slapos-client.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-client.install 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/slapos-client.install 2014-06-11 05:52:55 UTC (rev 10924)
@@ -19,8 +19,3 @@
usr/lib/python2.*/dist-packages/slapos.core-*-nspkg.pth
usr/bin/slapos
debian/conf/slapos-client.cfg usr/share/slapos-client
-## Deprecated commands in favor of an unique command (slapos)
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/__init__.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/util.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/console.py
-#usr/bin/slapconsole
Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2014-06-10 12:47:12 UTC (rev 10923)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2014-06-11 05:52:55 UTC (rev 10924)
@@ -1,10 +1,13 @@
usr/lib/python2.*/dist-packages/slapos/proxy
usr/lib/python2.*/dist-packages/slapos/bang.py
+usr/lib/python2.*/dist-packages/slapos/collect/
usr/lib/python2.*/dist-packages/slapos/format.py
usr/lib/python2.*/dist-packages/slapos/grid
usr/lib/python2.*/dist-packages/slapos/cli/supervisord.py
usr/lib/python2.*/dist-packages/slapos/cli/slapgrid.py
usr/lib/python2.*/dist-packages/slapos/cli/bang.py
+usr/lib/python2.*/dist-packages/slapos/cli/boot.py
+usr/lib/python2.*/dist-packages/slapos/cli/collect.py
usr/lib/python2.*/dist-packages/slapos/cli/supervisorctl.py
usr/lib/python2.*/dist-packages/slapos/cli/proxy_show.py
usr/lib/python2.*/dist-packages/slapos/cli/format.py
@@ -14,6 +17,7 @@
usr/lib/python2.*/dist-packages/slapos/cli/boot.py
usr/lib/python2.*/dist-packages/slapos/util.py
usr/lib/python2.*/dist-packages/slapos/tests/cli.py
+usr/lib/python2.*/dist-packages/slapos/tests/collect.py
usr/lib/python2.*/dist-packages/slapos/tests/slapproxy.py
usr/lib/python2.*/dist-packages/slapos/tests/slapgrid.py
usr/lib/python2.*/dist-packages/slapos/tests/slapformat.py
@@ -22,18 +26,3 @@
usr/lib/python2.*/dist-packages/slapos/tests/slapobject.py
usr/bin/slapos-watchdog usr/sbin
debian/conf/slapos-node-unofficial.cfg usr/share/slapos-node-unofficial
-## Deprecated commands in favor of an unique command (slapos)
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/slapgrid.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/bang.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/svcbackend.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/format.py
-#usr/lib/python2.*/dist-packages/slapos/cli_legacy/proxy_start.py
-#usr/bin/slapgrid usr/sbin
-#usr/bin/slapgrid-ur usr/sbin
-#usr/bin/slapgrid-cp usr/sbin
-#usr/bin/slapformat usr/sbin
-#usr/bin/slapgrid-supervisorctl usr/sbin
-#usr/bin/slapgrid-supervisord usr/sbin
-#usr/bin/slapproxy usr/sbin
-#usr/bin/slapgrid-sr usr/sbin
-#usr/bin/bang usr/sbin
More information about the Python-apps-commits
mailing list