From 04d4f3fdec0ac6057d6cc2a13227fa62b2fc7e0b Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 25 Jun 2015 17:39:13 +0200
Subject: [PATCH] just cosmetic

---
 db-config.d/030-conf_files_node_update | 86 ++++++++++++--------------
 nodeconfig/yum/yum.php                 |  4 --
 2 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/db-config.d/030-conf_files_node_update b/db-config.d/030-conf_files_node_update
index 36362fb..b127d9b 100644
--- a/db-config.d/030-conf_files_node_update
+++ b/db-config.d/030-conf_files_node_update
@@ -5,55 +5,49 @@ conf_files = [
 
 # myplc/noderepo
     # YUM configuration
-    {'enabled': True,
-     'source': 'yum/myplc.repo.php?gpgcheck=1',
-     'dest': '/etc/yum.myplc.d/myplc.repo',
-     'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
-     'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
-    {'enabled': True,
-     'source': 'yum/yum.php?path=yum.conf',
-     'dest': '/etc/yum.conf',
-     'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
-     'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
-    {'enabled': True,
-     'source': 'yum/yum.php?path=yum.myplc.d/stock.repo',
-     'dest': '/etc/yum.myplc.d/stock.repo',
-     'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
-     'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
-    
-# NodeUpdate
-    {'enabled': True,
-     'source': 'PlanetLabConf/delete-rpm-list-production',
-     'dest': '/etc/planetlab/delete-rpm-list',
-     'file_permissions': '644',
-     'file_owner': 'root',
-     'file_group': 'root',
-     'preinstall_cmd': '',
-     'postinstall_cmd': '',
-     'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
+        { 'enabled' : True,
+          'source' : 'yum/yum.php?path=yum.conf',
+          'dest' : '/etc/yum.conf',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          'preinstall_cmd' : '', 'postinstall_cmd' : '', 'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          'always_update' : False},
+        { 'enabled' : True,
+          'source' : 'yum/yum.php?path=yum.myplc.d/stock.repo',
+          'dest' : '/etc/yum.myplc.d/stock.repo',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          'preinstall_cmd' : '', 'postinstall_cmd' : '', 'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          'always_update' : False},
+        { 'enabled' : True,
+          'source' : 'yum/myplc.repo.php?gpgcheck=1',
+          'dest' : '/etc/yum.myplc.d/myplc.repo',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          'preinstall_cmd' : '', 'postinstall_cmd' : '', 'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          'always_update' : False},
     
 # NodeUpdate
+        { 'enabled' : True,
+          'source' : 'PlanetLabConf/delete-rpm-list-production',
+          'dest' : '/etc/planetlab/delete-rpm-list',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          'preinstall_cmd' : '',
+          'postinstall_cmd' : '',
+          'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          'always_update' : False},
+# NodeUpdate - ctd
     # /etc/planetlab/extensions
-    {'enabled': True,
-     'source': 'PlanetLabConf/extensions.php',
-     'dest': '/etc/planetlab/extensions',
-     'file_permissions': '644',
-     'file_owner': 'root',
-     'file_group': 'root',
-     'preinstall_cmd': '',
-     'postinstall_cmd': '',
-     'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
-    
+        { 'enabled' : True,
+          'source' : 'PlanetLabConf/extensions.php',
+          'dest' : '/etc/planetlab/extensions',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          'preinstall_cmd' : '',
+          'postinstall_cmd' : '',
+          'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          'always_update' : False},
     ]
 
 for conf_file in conf_files:
diff --git a/nodeconfig/yum/yum.php b/nodeconfig/yum/yum.php
index f116227..c5024cc 100644
--- a/nodeconfig/yum/yum.php
+++ b/nodeconfig/yum/yum.php
@@ -56,7 +56,3 @@ echo "#\n";
 echo "# yum.php could not find the following path\n";
 echo "# " . $fc_name . "\n";
 echo "# bailing out\n";
-
-
-
-
-- 
2.43.0