X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=db-config.d%2F030-conf_files_node_update;h=9b970d4a3851ed48ae4b916442df132755e358e2;hb=7c7004de1e05fdc36d63e5f4bf1076a0775431a5;hp=69ebcf427f8b14589c1010fece8cac8e1f6e7432;hpb=bf875be66195318943b34cd86845f9d83c0bdeb4;p=bootstrapfs.git

diff --git a/db-config.d/030-conf_files_node_update b/db-config.d/030-conf_files_node_update
index 69ebcf4..9b970d4 100644
--- a/db-config.d/030-conf_files_node_update
+++ b/db-config.d/030-conf_files_node_update
@@ -1,61 +1,68 @@
 # -*-python-*-
-# $Id: 030-conf_files 16642 2010-01-18 17:14:40Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/db-config.d/030-conf_files $
 #################### conf files
 
 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},
+        # starting with fedora 22 we need to tweak /etc/dnf/dnf.conf,
+        # not /etc/yum.conf
+        { 'enabled' : True,
+          'source' : 'yum/yum.php?path=dnf/dnf.conf',
+          'dest' : '/etc/dnf/dnf.conf',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          # ensure /etc/yum.repos.d is created as a symlink to /etc/yum.myplc.d
+          # since dnf under fedora22 does not seem to have a means to configure
+          # this location anymore
+          'preinstall_cmd' : '',
+          'postinstall_cmd' : 'bash -c "[ -d /etc/yum.repos.d ] || ln -sf /etc/yum.myplc.d /etc/yum.repos.d"',
+          'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          # here again, we need to make sure postinstall is always executed
+          'always_update' : True},
     
 # 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: