From a24e38a598702114545c650d6f75b550212e6aab Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 28 May 2007 21:59:41 +0000
Subject: * part two of settings file related changes (ticket#122):   - removed
 '.local' ending from several files

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1104 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 lib/distro-info/fedora-6/settings.example               | 10 ++++++++++
 lib/distro-info/fedora-6/settings.local.example         | 10 ----------
 lib/distro-info/fedora-6_x86_64/settings.example        | 10 ++++++++++
 lib/distro-info/fedora-6_x86_64/settings.local.example  | 10 ----------
 lib/distro-info/suse-10.1/settings.example              | 11 +++++++++++
 lib/distro-info/suse-10.1/settings.local.example        | 11 -----------
 lib/distro-info/suse-10.1_x86_64/settings.example       | 11 +++++++++++
 lib/distro-info/suse-10.1_x86_64/settings.local.example | 11 -----------
 lib/distro-info/suse-10.2/export-filter.example         | 12 ++++++++++++
 lib/distro-info/suse-10.2/export-filter.local.example   | 12 ------------
 lib/distro-info/suse-10.2/settings.example              | 11 +++++++++++
 lib/distro-info/suse-10.2/settings.local.example        | 11 -----------
 lib/distro-info/suse-10.2_x86_64/settings.example       | 11 +++++++++++
 lib/distro-info/suse-10.2_x86_64/settings.local.example | 11 -----------
 14 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 lib/distro-info/fedora-6/settings.example
 delete mode 100644 lib/distro-info/fedora-6/settings.local.example
 create mode 100644 lib/distro-info/fedora-6_x86_64/settings.example
 delete mode 100644 lib/distro-info/fedora-6_x86_64/settings.local.example
 create mode 100644 lib/distro-info/suse-10.1/settings.example
 delete mode 100644 lib/distro-info/suse-10.1/settings.local.example
 create mode 100644 lib/distro-info/suse-10.1_x86_64/settings.example
 delete mode 100644 lib/distro-info/suse-10.1_x86_64/settings.local.example
 create mode 100644 lib/distro-info/suse-10.2/export-filter.example
 delete mode 100644 lib/distro-info/suse-10.2/export-filter.local.example
 create mode 100644 lib/distro-info/suse-10.2/settings.example
 delete mode 100644 lib/distro-info/suse-10.2/settings.local.example
 create mode 100644 lib/distro-info/suse-10.2_x86_64/settings.example
 delete mode 100644 lib/distro-info/suse-10.2_x86_64/settings.local.example

(limited to 'lib')

diff --git a/lib/distro-info/fedora-6/settings.example b/lib/distro-info/fedora-6/settings.example
new file mode 100644
index 00000000..5fbe942d
--- /dev/null
+++ b/lib/distro-info/fedora-6/settings.example
@@ -0,0 +1,10 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/i386/os";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/i386/";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/fedora-6/settings.local.example b/lib/distro-info/fedora-6/settings.local.example
deleted file mode 100644
index 5fbe942d..00000000
--- a/lib/distro-info/fedora-6/settings.local.example
+++ /dev/null
@@ -1,10 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/i386/os";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/i386/";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
diff --git a/lib/distro-info/fedora-6_x86_64/settings.example b/lib/distro-info/fedora-6_x86_64/settings.example
new file mode 100644
index 00000000..5e4fec32
--- /dev/null
+++ b/lib/distro-info/fedora-6_x86_64/settings.example
@@ -0,0 +1,10 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/x86_64/os";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/x86_64/";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/fedora-6_x86_64/settings.local.example b/lib/distro-info/fedora-6_x86_64/settings.local.example
deleted file mode 100644
index 5e4fec32..00000000
--- a/lib/distro-info/fedora-6_x86_64/settings.local.example
+++ /dev/null
@@ -1,10 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/pub/linux/fedora/linux/core/6/x86_64/os";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/linux/fedora/linux/core/updates/6/x86_64/";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
diff --git a/lib/distro-info/suse-10.1/settings.example b/lib/distro-info/suse-10.1/settings.example
new file mode 100644
index 00000000..d56f393a
--- /dev/null
+++ b/lib/distro-info/suse-10.1/settings.example
@@ -0,0 +1,11 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source";
+$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/suse-10.1/settings.local.example b/lib/distro-info/suse-10.1/settings.local.example
deleted file mode 100644
index d56f393a..00000000
--- a/lib/distro-info/suse-10.1/settings.local.example
+++ /dev/null
@@ -1,11 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source";
-$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
diff --git a/lib/distro-info/suse-10.1_x86_64/settings.example b/lib/distro-info/suse-10.1_x86_64/settings.example
new file mode 100644
index 00000000..d56f393a
--- /dev/null
+++ b/lib/distro-info/suse-10.1_x86_64/settings.example
@@ -0,0 +1,11 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source";
+$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/suse-10.1_x86_64/settings.local.example b/lib/distro-info/suse-10.1_x86_64/settings.local.example
deleted file mode 100644
index d56f393a..00000000
--- a/lib/distro-info/suse-10.1_x86_64/settings.local.example
+++ /dev/null
@@ -1,11 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/SL-10.1/inst-source";
-$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/SL-10.1/non-oss-inst-source";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.1";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
diff --git a/lib/distro-info/suse-10.2/export-filter.example b/lib/distro-info/suse-10.2/export-filter.example
new file mode 100644
index 00000000..96f0d3bc
--- /dev/null
+++ b/lib/distro-info/suse-10.2/export-filter.example
@@ -0,0 +1,12 @@
+#add your own filters to this file and rename it to 'exclude-filter.local'
+#in order to overrule the filters provided by openslx
+#
+#Examples:
+#     the following line would include anything below /var/spool/
+#+ /var/spool/*
+#
+#     this would exclude anything in /etc that starts with dhcpd.conf
+#- /etc/dhcpd.conf*
+#
+#     and this would exclude all rpmnew-files:
+#- *.rpmnew
diff --git a/lib/distro-info/suse-10.2/export-filter.local.example b/lib/distro-info/suse-10.2/export-filter.local.example
deleted file mode 100644
index 96f0d3bc..00000000
--- a/lib/distro-info/suse-10.2/export-filter.local.example
+++ /dev/null
@@ -1,12 +0,0 @@
-#add your own filters to this file and rename it to 'exclude-filter.local'
-#in order to overrule the filters provided by openslx
-#
-#Examples:
-#     the following line would include anything below /var/spool/
-#+ /var/spool/*
-#
-#     this would exclude anything in /etc that starts with dhcpd.conf
-#- /etc/dhcpd.conf*
-#
-#     and this would exclude all rpmnew-files:
-#- *.rpmnew
diff --git a/lib/distro-info/suse-10.2/settings.example b/lib/distro-info/suse-10.2/settings.example
new file mode 100644
index 00000000..7021fa6a
--- /dev/null
+++ b/lib/distro-info/suse-10.2/settings.example
@@ -0,0 +1,11 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss";
+$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.2";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/suse-10.2/settings.local.example b/lib/distro-info/suse-10.2/settings.local.example
deleted file mode 100644
index 7021fa6a..00000000
--- a/lib/distro-info/suse-10.2/settings.local.example
+++ /dev/null
@@ -1,11 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss";
-$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.2";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
diff --git a/lib/distro-info/suse-10.2_x86_64/settings.example b/lib/distro-info/suse-10.2_x86_64/settings.example
new file mode 100644
index 00000000..7021fa6a
--- /dev/null
+++ b/lib/distro-info/suse-10.2_x86_64/settings.example
@@ -0,0 +1,11 @@
+# copy this file to 'settings' and edit it as you please
+
+# use local installation sources
+$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss";
+$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss";
+$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.2";
+
+# Add a new selection:
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/suse-10.2_x86_64/settings.local.example b/lib/distro-info/suse-10.2_x86_64/settings.local.example
deleted file mode 100644
index 7021fa6a..00000000
--- a/lib/distro-info/suse-10.2_x86_64/settings.local.example
+++ /dev/null
@@ -1,11 +0,0 @@
-# copy this file to 'settings' and edit it as you please
-
-# use local installation sources
-$repository{'base'}->{'url'} = "local://localhost:5080/srv/ftp/pub/opensuse/distribution/10.2/repo/oss";
-$repository{'base_non-oss'}->{'url'} = "local://localhost:5081/srv/ftp/pub/opensuse/distribution/10.2/repo/non-oss";
-$repository{'base_update'}->{'url'} = "local://localhost:5082/srv/ftp/pub/suse/update/10.2";
-
-# Add a new selection:
-# $selection{'my-kde'} = "$selection{default}
-# foo
-# bar";
-- 
cgit v1.2.3-55-g7522