From 3912ea191128b94588f10b17a833a2359bafe583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster=20=28Dessa=29?= Date: Wed, 14 Dec 2011 14:09:36 +0100 Subject: [PATCH] rename our SUSE Linux 10 Templates to SUSE Linux Enterprise 10. Come on, SUSE 10 is long time EOL upstream, upgrade your stuff. the Templates should work unmodified on SLE10. We currently plan to keep the Templates until general support for SLE10 ends (which is mid-2013 as of now) and / or upstream stops building froxlor for SLE10 in the OBS. (this is of course, subject to change.) --- lib/configfiles/{suse10.inc.php => sle10.inc.php} | 4 ++-- lib/configfiles_index.inc.php | 2 +- .../courier/etc_authlib_authdaemonrc | 0 .../courier/etc_authlib_authmysqlrc | 0 .../{suse_linux_10_0 => sle_10}/cron/etc_cron.d_froxlor | 0 .../{suse_linux_10_0 => sle_10}/dkim/dkim-filter.conf | 0 .../{suse_linux_10_0 => sle_10}/postfix/etc_postfix_main.cf | 0 .../postfix/etc_postfix_mysql-virtual_alias_maps.cf | 0 .../postfix/etc_postfix_mysql-virtual_mailbox_domains.cf | 0 .../postfix/etc_postfix_mysql-virtual_mailbox_maps.cf | 0 .../postfix/etc_postfix_mysql-virtual_sender_permissions.cf | 0 .../postfix/usr_lib_sasl2_smtpd.conf | 0 .../postfix_mxaccess/etc_postfix_main.cf | 0 .../postfix_mxaccess/etc_postfix_mx_access | 0 .../proftpd/etc_proftpd_modules.conf | 0 .../proftpd/etc_proftpd_proftpd.conf | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename lib/configfiles/{suse10.inc.php => sle10.inc.php} (99%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/courier/etc_authlib_authdaemonrc (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/courier/etc_authlib_authmysqlrc (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/cron/etc_cron.d_froxlor (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/dkim/dkim-filter.conf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/etc_postfix_main.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/etc_postfix_mysql-virtual_alias_maps.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/etc_postfix_mysql-virtual_sender_permissions.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix/usr_lib_sasl2_smtpd.conf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix_mxaccess/etc_postfix_main.cf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/postfix_mxaccess/etc_postfix_mx_access (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/proftpd/etc_proftpd_modules.conf (100%) rename templates/misc/configfiles/{suse_linux_10_0 => sle_10}/proftpd/etc_proftpd_proftpd.conf (100%) diff --git a/lib/configfiles/suse10.inc.php b/lib/configfiles/sle10.inc.php similarity index 99% rename from lib/configfiles/suse10.inc.php rename to lib/configfiles/sle10.inc.php index 945292e6..ef03cd05 100644 --- a/lib/configfiles/suse10.inc.php +++ b/lib/configfiles/sle10.inc.php @@ -18,8 +18,8 @@ */ return Array( - 'suse_linux_10_0' => Array( - 'label' => 'SUSE Linux 10.0', + 'sle_10' => Array( + 'label' => 'SUSE Linux Enterprise 10', 'services' => Array( 'http' => Array( 'label' => $lng['admin']['configfiles']['http'], diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php index 92fa90ee..c6af0001 100644 --- a/lib/configfiles_index.inc.php +++ b/lib/configfiles_index.inc.php @@ -45,5 +45,5 @@ else $cfgPath = 'lib/configfiles/'; $configfiles = Array(); -$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'lenny.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php'); +$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'lenny.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php'); diff --git a/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authdaemonrc b/templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authdaemonrc rename to templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc diff --git a/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authmysqlrc b/templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authmysqlrc rename to templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc diff --git a/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor rename to templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor diff --git a/templates/misc/configfiles/suse_linux_10_0/dkim/dkim-filter.conf b/templates/misc/configfiles/sle_10/dkim/dkim-filter.conf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/dkim/dkim-filter.conf rename to templates/misc/configfiles/sle_10/dkim/dkim-filter.conf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_main.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_main.cf rename to templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf rename to templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alias_maps.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf rename to templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf rename to templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_sender_permissions.cf rename to templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_sender_permissions.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/usr_lib_sasl2_smtpd.conf b/templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix/usr_lib_sasl2_smtpd.conf rename to templates/misc/configfiles/sle_10/postfix/usr_lib_sasl2_smtpd.conf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix_mxaccess/etc_postfix_main.cf rename to templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_main.cf diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/postfix_mxaccess/etc_postfix_mx_access rename to templates/misc/configfiles/sle_10/postfix_mxaccess/etc_postfix_mx_access diff --git a/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_modules.conf rename to templates/misc/configfiles/sle_10/proftpd/etc_proftpd_modules.conf diff --git a/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf similarity index 100% rename from templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_proftpd.conf rename to templates/misc/configfiles/sle_10/proftpd/etc_proftpd_proftpd.conf