[Pkg-debile-commits] [debile-slave] 01/01: Removing lucy occurences

[Léo Cavaillé]

This is an automated email from the git hooks/post-receive script.

leo.cavaille-guest pushed a commit to branch master
in repository debile-slave.

commit 22bfd95b9f3da261cb51c339f18d738007bc9106
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 23 11:55:49 2013 +0200

    Removing lucy occurences
---
 debile/slave/client.py |    8 ++++----
 debile/slave/config.py |    2 +-
 debile/slave/daemon.py |    6 +++---
 debile/slave/utils.py  |    2 +-
 skel/debile-slave.ini  |   14 ++++++--------
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debile/slave/client.py b/debile/slave/client.py
index 52bd984..0a42878 100644
--- a/debile/slave/client.py
+++ b/debile/slave/client.py
@@ -12,10 +12,10 @@ def get_proxy():
     config = Config()
     proxy = xmlrpclib.ServerProxy(
         "http://{user}:{password}@{host}:{port}/".format(
-            user=config.get('lucy', 'user'),
-            password=config.get('lucy', 'password'),
-            host=config.get('lucy', 'host'),
-            port=config.get('lucy', 'port')
+            user=config.get('master', 'user'),
+            password=config.get('master', 'password'),
+            host=config.get('master', 'host'),
+            port=config.get('master', 'port')
         ), allow_none=True)
     return proxy
 
diff --git a/debile/slave/config.py b/debile/slave/config.py
index dfdfbd1..6fcecbd 100644
--- a/debile/slave/config.py
+++ b/debile/slave/config.py
@@ -9,7 +9,7 @@ class Config(ConfigParser.ConfigParser):
             cls._instance = super(Config, cls).__new__(cls, *args, **kwargs)
             return cls._instance
 
-    def __init__(self, location="/etc/debile-master.ini"):
+    def __init__(self, location="/etc/debile-slave.ini"):
         ConfigParser.ConfigParser.__init__(self)
         self.read(location)
 
diff --git a/debile/slave/daemon.py b/debile/slave/daemon.py
index ddb3a67..555f565 100644
--- a/debile/slave/daemon.py
+++ b/debile/slave/daemon.py
@@ -111,7 +111,7 @@ def iterate():
                         proxy.get_write_location(job['uuid'])
                     remote_firehose_path = \
                         os.path.join(remote_firehose_path, 'firehose.xml')
-                    cmd = config.get('lucy', 'copy')\
+                    cmd = config.get('master', 'copy')\
                         .format(src='firehose.xml', dest=remote_firehose_path)
                     out, err, ret = run_command(cmd)
                     ### SCANDALOUS HACK
@@ -127,7 +127,7 @@ def iterate():
                                 os.path.join(
                                     remote_scanbuild_path,
                                     'scan-build')
-                            cmd = config.get('lucy', 'copy')\
+                            cmd = config.get('master', 'copy')\
                                 .format(src=failed[0],
                                         dest=remote_scanbuild_path)
                             out, err, ret = run_command(cmd)
@@ -139,7 +139,7 @@ def iterate():
                     remote_log_path = proxy.get_write_location(job['uuid'])
                     remote_log_path = os.path.join(remote_log_path, 'log.txt')
                     open('job-log', 'wb').write(log.encode('utf-8'))
-                    cmd = config.get('lucy', 'copy')\
+                    cmd = config.get('master', 'copy')\
                         .format(src='job-log', dest=remote_log_path)
                     out, err, ret = run_command(cmd)
                     if ret != 0:
diff --git a/debile/slave/utils.py b/debile/slave/utils.py
index de88b39..0011be4 100644
--- a/debile/slave/utils.py
+++ b/debile/slave/utils.py
@@ -89,7 +89,7 @@ def safe_run(cmd, expected=0):
 
 def dget(url):
     # TODO : add some logging here, useful to setup correctly the
-    # "public" parameter in lucy
+    # "pool_url" parameter in debile-master
     safe_run(["dget", "-u", "-d", url])
 
 
diff --git a/skel/debile-slave.ini b/skel/debile-slave.ini
index 238dd34..7bc67c8 100644
--- a/skel/debile-slave.ini
+++ b/skel/debile-slave.ini
@@ -1,17 +1,15 @@
-[lucy]
-# The address or IP to contact lucy
-host=debian-manager.via.ecp.fr
-# The port to contact lucy
+[master]
+# The address or IP to contact debile-master
+host=debile.debian.net
+# The port to contact debile-master
 port=20017
 
-# Authentication to lucy
+# Authentication to debile-master
 user=debian-builder1
 password=password
 
-# Where to dput, must be an entry of the ~/.dput.cf
-dput-host=debian-manager
 # Where to send the logs, the same host as dput, same path without incoming/
-copy=scp -r {src} lucy at debian-manager.via.ecp.fr:{dest}
+copy=scp -r {src} debile at debile.debian.net:{dest}
 
 [gpg]
 # The GPG key of the builder machine

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-slave.git