From a130013c5d48ac3821d181c1930458b8bba2a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster=20=28Dessa=29?= Date: Fri, 23 May 2014 12:08:23 +0200 Subject: [PATCH] some os deprecations - SLE10 will be replaced by SLE11 - opensuse11 will be replaced by opensuse13 once i managed to clean up the configs from upstream - ubuntu lucid will be replaced by ubuntu trusty once i get to it --- lib/configfiles/lucid.inc.php | 2 +- lib/configfiles/sle10.inc.php | 2 +- lib/configfiles/{suse11.inc.php => sle11.inc.php} | 4 ++-- lib/configfiles_index.inc.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename lib/configfiles/{suse11.inc.php => sle11.inc.php} (99%) diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php index 58f04c79..b267574d 100644 --- a/lib/configfiles/lucid.inc.php +++ b/lib/configfiles/lucid.inc.php @@ -36,7 +36,7 @@ if ($vmail_group === false) { return array( 'ubuntu_lucid' => array( - 'label' => 'Ubuntu 10.04 (Lucid)', + 'label' => 'Ubuntu 10.04 (Lucid) [deprecated]', 'services' => array( 'http' => array( 'label' => $lng['admin']['configfiles']['http'], diff --git a/lib/configfiles/sle10.inc.php b/lib/configfiles/sle10.inc.php index e0dccefa..37bdc43c 100644 --- a/lib/configfiles/sle10.inc.php +++ b/lib/configfiles/sle10.inc.php @@ -36,7 +36,7 @@ if ($vmail_group === false) { return array( 'sle_10' => array( - 'label' => 'SUSE Linux Enterprise 10', + 'label' => 'SUSE Linux Enterprise 10 (deprecated)', 'services' => array( 'http' => array( 'label' => $lng['admin']['configfiles']['http'], diff --git a/lib/configfiles/suse11.inc.php b/lib/configfiles/sle11.inc.php similarity index 99% rename from lib/configfiles/suse11.inc.php rename to lib/configfiles/sle11.inc.php index 6f98a648..64a10260 100644 --- a/lib/configfiles/suse11.inc.php +++ b/lib/configfiles/sle11.inc.php @@ -35,8 +35,8 @@ if ($vmail_group === false) { } return array( - 'opensuse_11_x' => array( - 'label' => 'openSUSE 11.x', + 'sle_11' => array( + 'label' => 'SUSE Linux Enterprise 11', 'services' => array( 'http' => array( 'label' => $lng['admin']['configfiles']['http'], diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php index ca47f5ef..d64a46bf 100644 --- a/lib/configfiles_index.inc.php +++ b/lib/configfiles_index.inc.php @@ -45,7 +45,7 @@ $configfiles = array_merge( include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', - include $cfgPath . 'suse11.inc.php', + include $cfgPath . 'sle11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php' );