From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Jul 2009 06:51:30 +0000 (+0000)
Subject: cleanup obsolete conf_file
X-Git-Tag: MyPLC-4.3-22~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0eae512d6f3d95e6fc8d3874e24f81ccdb396521;p=myplc.git

cleanup obsolete conf_file
---

diff --git a/db-config.d/05-conffiles b/db-config.d/05-conffiles
index 53ee4d6..c6d4386 100644
--- a/db-config.d/05-conffiles
+++ b/db-config.d/05-conffiles
@@ -1,3 +1,4 @@
+# -*-python-*-
 #################### conf files
 # Setup default PlanetLabConf entries
 
@@ -246,17 +247,18 @@ conf_files = [
      'always_update': False},
     
     # GPG signing keys
-    {'enabled': True,
-     'source': 'PlanetLabConf/RPM-GPG-KEY-fedora',
-     'dest': '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora',
-     'file_permissions': '644',
-     'file_owner': 'root',
-     'file_group': 'root',
-     'preinstall_cmd': '',
-     'postinstall_cmd': 'rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora',
-     'error_cmd': '',
-     'ignore_cmd_errors': False,
-     'always_update': False},
+# this one comes with rpm fedora-release-8-6.transition on fedora 8
+#    {'enabled': True,
+#     'source': 'PlanetLabConf/RPM-GPG-KEY-fedora',
+#     'dest': '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora',
+#     'file_permissions': '644',
+#     'file_owner': 'root',
+#     'file_group': 'root',
+#     'preinstall_cmd': '',
+#     'postinstall_cmd': 'rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora',
+#     'error_cmd': '',
+#     'ignore_cmd_errors': False,
+#     'always_update': False},
     {'enabled': True,
      'source': 'PlanetLabConf/get_gpg_key.php',
      'dest': '/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab',