Hello community,
here is the log from the commit of package froxlor for openSUSE:Factory checked
in at 2015-04-13 20:31:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/froxlor (Old)
and /work/SRC/openSUSE:Factory/.froxlor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "froxlor"
Changes:
--------
--- /work/SRC/openSUSE:Factory/froxlor/froxlor.changes 2014-05-21
16:19:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.froxlor.new/froxlor.changes 2015-04-13
20:31:46.000000000 +0200
@@ -2 +2 @@
-Wed May 21 11:56:01 CEST 2014 - ase...@suse.de
+Mon Apr 13 10:34:59 CEST 2015 - ase...@suse.de
@@ -4,2 +4,53 @@
-- updating frolxor howto link in idir/README.SUSE
- fixing configuration file suse.inc.php
+- upstream upgrade to version 0.9.33.1 (bnc#846355)
+Bug #1489: MySQL externe Datenbank
+Bug #1498: Problem with nginx vhost block merging
+Bug #1499: 0.9.33 wants to connect to host as socket
+Bug #1500: "Global PEAR directories" settings value in php-fpm settings
ignored in php.ini settings variable "{PEAR_DIR}"
+Support #1494: new customer | webaccess Forbidden
+
+- upstream upgrade to version 0.9.33 (bnc#846355)
+Bug #1479: Update of password hash leads to security hole
+Bug #1483: Lockfile from crashed cronjob does not get deleted
+
+- upstream upgrade to version 0.9.33-rc2 (bnc#846355)
+Bug #1427: [nginx] OwnCloud Requires PHP alterations
+Bug #1459: [configs] Debian postfix templates are in deprecated format
+Bug #1462: [configs] Ubuntu 14.04 does not use SystemV
+Bug #1465: [configs] Dovecot/Postfix Config says to use dovecot as transport
but does not
+Bug #1469: Misleading "PHP compiled without pcntl" error message
+Feature #1289: Passwords in panel_customers always MD5 encrypted
+Feature #1335: [database] Froxlor should also use MySQL-Socket to connect to db
+Feature #1414: [configs] Ubuntu 14.04 LTS support
+Feature #1471: Zusätzliches Feld für Notizen in den Kundenstammdaten
+Feature #1477: Ability to set the path of a (sub)domain to a file
+
+- upstream upgrade to version 0.9.33-rc1 (bnc#846355)
+Bug #1216: suggested password should match to password restriction in settings
+Bug #1280: DKIM: define custom user and group in the settings
+Bug #1399: [proftpd] quota support OFF but working qoutas at FTP upload
+Bug #1418: [php-fpm] Fix for CVE-2014-0185 needed (php5-fpm vulnerability)
+Bug #1426: Umlaute problem
+Bug #1428: Creating SSL enabled Alias Domain -> SQL Integrity constraint
violation
+Bug #1430: [nginx] If in location ~ \.php$
+Bug #1435: Nach entfernen aller Daten im root-Verzeichnis erscheint folgender
Fehler (Froxlor WebFTP)
+Bug #1437: 0.9.32 - FreeBSD - crontab
+Bug #1440: Validation check for AXFR server failing
+Bug #1445: Froxlor cron du's /proc
+Bug #1446: nginx auto index is not working
+Bug #1447: Dateirechte beim Anlegen neuer Kunden falsch
+Bug #1450: [nginx] Directory protection duplicate directives
+Bug #1455: [apache] Directory protection not working (froxlor 0.9.31, Apache
2.4.6)
+Bug #1456: dns entry for "system_hostname" breaks dns if the domain is
manually configured
+Bug #1458: Security check too strict on mailboxsize cronscript
+Bug #1464: class.Settings.php
+Bug #1466: CSS: Overview pages without add-button missing float-clear
+Bug #1467: Progressbars on admin_customers.php?page=customer
+Bug #1468: MYSQL: BLOB and TEXT columns cannot have DEFAULT values.
+Feature #496: [panel] Import default subject/body for e-mails templates
+Feature #1036: Improve the montly traffic report
+Feature #1166: [panel] Allow customer transfer between admins
+Feature #1332: mehrzeiliger SPF support
+Feature #1408: Eigener Newsbereich im Kunden-Dashboard
+Feature #1410: Verschieben von Kunden unter Admins
+Feature #1425: Php-fpm custom listen
+Feature #1452: Massenupdate beim Hinzufügen von Domains
@@ -16,14 +66,0 @@
-
--------------------------------------------------------------------
-Tue Feb 25 11:44:42 CET 2014 - ase...@suse.de
-
-- upstream upgrade to version 0.9.32-rc1 (bnc#846355)
-#69: calculate/show mail-traffic
-#433: redirect to last URL after session-timeout
-#1321: log faulty login-attempts
-#1340: add 'description' to ftp-users
-#1378: added database validation in the admin menu to check for its integrity
-#858: runtime of cronjobs
-- APS (complete)
-- Autoresponder (complete)
-- Backup (complete)
Old:
----
froxlor-0.9.32.2.tar.bz2
New:
----
froxlor-0.9.33.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ froxlor.spec ++++++
--- /var/tmp/diff_new_pack.6Hoame/_old 2015-04-13 20:31:47.000000000 +0200
+++ /var/tmp/diff_new_pack.6Hoame/_new 2015-04-13 20:31:47.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package froxlor
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define apache_serverroot /srv/www/htdocs
Name: froxlor
-Version: 0.9.32.2
+Version: 0.9.33.1
Release: 0
Source0: froxlor-%{version}.tar.bz2
Source1: froxlor.suse.adapt.template.config.tar.bz2
@@ -48,6 +48,7 @@
Requires: php5-bcmath
Requires: php5-mysql
Requires: php5-posix
+Requires: php5-curl
Requires: postfix
Requires: postfix-mysql
Requires: pure-ftpd
@@ -76,9 +77,9 @@
#mkdir -p uploadfiles
#chmod -R 707 images
-echo "froxlor installation see doc
http://redmine.froxlor.org/projects/froxlor/wiki"; > $idir/README.SUSE
+echo "froxlor installation see doc http://wiki.froxlor.org/"; >
$idir/README.SUSE
echo "see also froxlor website http://www.froxlor.org/"; >> $idir/README.SUSE
-echo "For SLE11 and SLE10 see README" >> $idir/README.SUSE
+echo "For SLE11 and SLE12 see README" >> $idir/README.SUSE
%clean
rm -rf "$RPM_BUILD_ROOT"
++++++ configfiles_index.inc.php.patch ++++++
--- /var/tmp/diff_new_pack.6Hoame/_old 2015-04-13 20:31:47.000000000 +0200
+++ /var/tmp/diff_new_pack.6Hoame/_new 2015-04-13 20:31:47.000000000 +0200
@@ -1,11 +1,10 @@
---- lib/configfiles_index.inc.php.old 2014-03-11 11:07:14.000000000 +0100
-+++ lib/configfiles_index.inc.php 2014-03-20 09:56:24.698164117 +0100
-@@ -45,7 +45,7 @@
+--- lib/configfiles_index.inc.php.old 2015-04-13 12:24:35.379888120 +0200
++++ lib/configfiles_index.inc.php 2015-04-13 12:31:08.810607102 +0200
+@@ -50,6 +50,7 @@
include $cfgPath . 'precise.inc.php',
include $cfgPath . 'lucid.inc.php',
include $cfgPath . 'gentoo.inc.php',
-- include $cfgPath . 'suse11.inc.php',
+ include $cfgPath . 'suse.inc.php',
+ include $cfgPath . 'sle11.inc.php',
include $cfgPath . 'sle10.inc.php',
include $cfgPath . 'freebsd.inc.php'
- );
++++++ froxlor-0.9.32.2.tar.bz2 -> froxlor-0.9.33.1.tar.bz2 ++++++
++++ 117499 lines of diff (skipped)
++++++ froxlor.sql.patch ++++++
++++ 850 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/froxlor/froxlor.sql.patch
++++ and /work/SRC/openSUSE:Factory/.froxlor.new/froxlor.sql.patch
++++++ froxlor.suse.adapt.template.config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/froxlor/lib/configfiles/suse.inc.php
new/froxlor/lib/configfiles/suse.inc.php
--- old/froxlor/lib/configfiles/suse.inc.php 2014-05-21 11:53:55.000000000
+0200
+++ new/froxlor/lib/configfiles/suse.inc.php 2013-10-11 13:42:49.000000000
+0200
@@ -1,104 +1,90 @@
<?php
/**
+ * copy of suse_linux_10_0 addapted fot opensuse11.x Andrej Semen
<ase...@suse.de>
* This file is part of the Froxlor project.
- * Copyright (c) 20
'echo "include \"' . Settings::Get['system']['bindconf_directory'] .
'froxlor_bind.conf\";" >> /etc/named.conf',
- 'mkdir -p ' .
Settings::Get['system']['bindconf_directory'] ,
- 'touch ' .
Settings::Get['system']['bindconf_directory'] . 'froxlor_bind.conf',
- 'chown named:0 ' .
Settings::Get['system']['bindconf_directory'] . 'froxlor_bind.conf',
- 'chmod 0600 ' .
Settings::Get['system']['bindconf_directory'] . 'froxlor_bind.conf'
-1- the Froxlor Team (see authors).
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
- * @author Andrej Semen <ase...@suse.de> (2010-2011)
- * @author Wolfgang Rosenauer <w...@rosenauer.org> (2011)
- * @author Froxlor team <t...@froxlor.org> (2011-)
+ * @author Florian Lippert <f...@syscp.org> (2003-2009)
+ * @author Froxlor team <t...@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Configfiles
- *
+ * @version copy of suse_linux_10_0 addapted fot opensuse11.x Andrej Semen
<ase...@suse.de>
*/
-// Try to guess user/group from settings' email UID/GID
-$vmail_user=posix_getpwuid(Settings::Get('system.vmail_uid'));
-$vmail_group=posix_getgrgid(Settings::Get('system.vmail_gid'));
-
-/* If one of them are not set, call it 'vmail' and suggest creating user/group
- * in scripts. */
-if ($vmail_user === false) {
- $vmail_username="vmail";
-} else {
- $vmail_username=$vmail_user['name'];
-}
-if ($vmail_group === false) {
- $vmail_groupname="vmail";
-} else {
- $vmail_groupname=$vmail_group['name'];
-}
-
-return array(
- 'opensuse_12_x' => array(
+return Array(
+ 'suse_linux_12_x' => Array(
'label' => 'openSUSE 12.x',
- 'services' => array(
- 'http' => array(
+ 'services' => Array(
+ 'http' => Array(
'label' => $lng['admin']['configfiles']['http'],
- 'daemons' => array(
- 'apache' => array(
+ 'daemons' => Array(
+ 'apache' => Array(
'label' => 'Apache',
- 'commands' => array(
- 'mkdir -p ' .
Settings::Get('system.documentroot_prefix'),
- 'mkdir -p ' .
Settings::Get('system.logfiles_directory'),
- 'Maybe add to
/etc/apache2/httpd.conf',
- 'Alias /mail
/srv/www/htdocs/roundcubemail',
- 'Alias /webmail
/srv/www/htdocs/squirrelmail',
-
(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' .
Settings::Get('system.deactivateddocroot') : ''
+ 'commands' => Array(
+
//$configcommand['vhost'],
+
$configcommand['diroptions'],
+
$configcommand['includesuse'],
+ 'mkdir -p ' .
$settings['system']['documentroot_prefix'],
+ 'mkdir -p ' .
$settings['system']['logfiles_directory'],
+ 'Add to
/etc/apache2/httpd.conf',
+ 'Alias /froxlor
/srv/www/htdocs/froxlor',
+ '#Alias /mail
/srv/www/htdocs/roundcubemail',
+ '#Alias /webmail
/srv/www/htdocs/squirrelmail',
+
($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' .
$settings['system']['deactivateddocroot'] : ''
),
- 'restart' => array(
+ 'restart' => Array(
' '.
'/etc/init.d/apache2
restart'
)
),
)
),
- 'dns' => array(
+ 'dns' => Array(
'label' => $lng['admin']['configfiles']['dns'],
- 'daemons' => array(
- 'bind' => array(
+ 'daemons' => Array(
+ 'bind' => Array(
'label' => 'Bind9',
- 'commands' => array(
- 'Add froxlor_bind.conf
to the NAMED_CONF_INCLUDE_FILES in /etc/sysconfig/named'
-
+ 'commands' => Array(
+ 'echo "include \"' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >>
/etc/named.conf',
+ 'mkdir -p ' .
$settings['system']['bindconf_directory'] ,
+ 'touch ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+ 'chown named:0 ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+ 'chmod 0600 ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
),
- 'restart' => array(
+ 'restart' => Array(
'/etc/init.d/named
restart'
)
),
)
),
- 'smtp' => array(
+ 'smtp' => Array(
'label' => $lng['admin']['configfiles']['smtp'],
- 'daemons' => array(
- 'postfix' => array(
+ 'daemons' => Array(
+ 'postfix' => Array(
'label' => 'Postfix',
- 'files' => array(
+ 'files' => Array(
'etc_postfix_main.cf'
=> '/etc/postfix/main.cf',
-
'etc_postfix_mysql-virtual_alias_maps.cf' =>
'/etc/postfix/mysql_virtual_alias_maps.cf',
-
'etc_postfix_mysql-virtual_mailbox_domains.cf' =>
'/etc/postfix/mysql_virtual_mailbox_domains.cf',
-
'etc_postfix_mysql-virtual_mailbox_maps.cf' =>
'/etc/postfix/mysql_virtual_mailbox_maps.cf',
+
'etc_postfix_mysql_virtual_alias_maps.cf' =>
'/etc/postfix/mysql_virtual_alias_maps.cf',
+
'etc_postfix_mysql_virtual_mailbox_domains.cf' =>
'/etc/postfix/mysql_virtual_mailbox_domains.cf',
+
'etc_postfix_mysql_virtual_mailbox_maps.cf' =>
'/etc/postfix/mysql_virtual_mailbox_maps.cf',
'etc_sasl2_smtpd.conf'
=> '/etc/sasl2/smtpd.conf'
),
- 'commands' => array(
- ($vmail_group ===
false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' .
$vmail_groupname : '',
- ($vmail_user === false)
? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname
. ' ' . $vmail_username : '',
- 'mkdir -p ' .
Settings::Get('system.vmail_homedir'),
- 'chown -R ' .
$vmail_username . ':' . $vmail_groupname . ' ' .
Settings::Get('system.vmail_homedir'),
+ 'commands' => Array(
'mkdir -p
/var/spool/postfix/etc/pam.d',
- 'touch
/etc/postfix/mysql-virtual_alias_maps.cf',
- 'touch
/etc/postfix/mysql-virtual_mailbox_domains.cf',
- 'touch
/etc/postfix/mysql-virtual_mailbox_maps.cf',
+ 'groupadd -g ' .
$settings['system']['vmail_gid'] . ' vmail',
+ 'useradd -u ' .
$settings['system']['vmail_uid'] . ' -g vmail vmail',
+ 'mkdir -p ' .
$settings['system']['vmail_homedir'],
+ 'chown -R vmail:vmail '
. $settings['system']['vmail_homedir'],
+ 'touch
/etc/postfix/mysql_virtual_alias_maps.cf',
+ 'touch
/etc/postfix/mysql_virtual_mailbox_domains.cf',
+ 'touch
/etc/postfix/mysql_virtual_mailbox_maps.cf',
'touch
/etc/sasl2/smtpd.conf',
'chmod 660
/etc/postfix/mysql_virtual_alias_maps.cf',
'chmod 660
/etc/postfix/mysql_virtual_mailbox_domains.cf',
@@ -109,160 +95,108 @@
'chgrp postfix
/etc/postfix/mysql_virtual_mailbox_maps.cf',
'chgrp postfix
/etc/sasl2/smtpd.conf'
),
- 'restart' => array(
+ 'restart' => Array(
'/etc/init.d/postfix
restart'
)
),
- 'postfix_mxaccess' => array(
+ 'postfix_mxaccess' => Array(
'label' => 'Postfix MX-Access
(anti spam)',
- 'files' => array(
+ 'files' => Array(
'etc_postfix_mx_access'
=> '/etc/postfix/mx_access',
'etc_postfix_main.cf'
=> '/etc/postfix/main.cf'
),
- 'commands_1' => array(
+ 'commands_1' => Array(
'postmap
/etc/postfix/mx_access'
),
- 'restart' => array(
+ 'restart' => Array(
'/etc/init.d/postfix
restart'
)
- ),
- 'postfix_dovecot' => array(
- 'label' => 'Postfix/Dovecot',
- 'commands' => array(
- ($vmail_group ===
false) ? 'groupadd -g ' . Settings::Get('system.vmail_gid') . ' ' .
$vmail_groupname : '',
- ($vmail_user === false)
? 'useradd -u ' . Settings::Get('system.vmail_uid') . ' -g ' . $vmail_groupname
. ' ' . $vmail_username : '',
- 'zypper install postfix
postfix-mysql',
- 'mkdir -p
/var/spool/postfix/etc/pam.d',
- 'mkdir -p
/var/spool/postfix/var/run/mysqld',
- 'mkdir -p ' .
Settings::Get('system.vmail_homedir'),
- 'chown -R
'.$vmail_username.':'.$vmail_groupname.' ' .
Settings::Get('system.vmail_homedir'),
- 'touch
/etc/postfix/mysql-virtual_alias_maps.cf',
- 'touch
/etc/postfix/mysql-virtual_mailbox_domains.cf',
- 'touch
/etc/postfix/mysql-virtual_mailbox_maps.cf',
- 'touch
/etc/postfix/mysql-virtual_sender_permissions.cf',
- 'chown root:postfix
/etc/postfix/mysql-virtual_alias_maps.cf',
- 'chown root:postfix
/etc/postfix/mysql-virtual_mailbox_domains.cf',
- 'chown root:postfix
/etc/postfix/mysql-virtual_mailbox_maps.cf',
- 'chown root:postfix
/etc/postfix/mysql-virtual_sender_permissions.cf',
- 'chmod 0640
/etc/postfix/mysql-virtual_alias_maps.cf',
- 'chmod 0640
/etc/postfix/mysql-virtual_mailbox_domains.cf',
- 'chmod 0640
/etc/postfix/mysql-virtual_mailbox_maps.cf',
- 'chmod 0640
/etc/postfix/mysql-virtual_sender_permissions.cf'
- ),
- 'files' => array(
- 'etc_postfix_main.cf'
=> '/etc/postfix/main.cf',
- 'etc_postfix_master.cf'
=> '/etc/postfix/master.cf',
-
'etc_postfix_mysql-virtual_alias_maps.cf' =>
'/etc/postfix/mysql-virtual_alias_maps.cf',
-
'etc_postfix_mysql-virtual_mailbox_domains.cf' =>
'/etc/postfix/mysql-virtual_mailbox_domains.cf',
-
'etc_postfix_mysql-virtual_mailbox_maps.cf' =>
'/etc/postfix/mysql-virtual_mailbox_maps.cf',
-
'etc_postfix_mysql-virtual_sender_permissions.cf' =>
'/etc/postfix/mysql-virtual_sender_permissions.cf'
- ),
- 'restart' => array(
- '/etc/init.d/postfix
restart',
- 'newaliases'
- )
- ),
- 'exim4' => array(
- 'label' => 'Exim4',
- 'commands_1' => array(
- 'zypper install exim'
- ),
- 'files' => array(
-
'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' =>
'/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
-
'etc_exim4_conf.d_auth_30_froxlor-config' =>
'/etc/exim4/conf.d/auth/30_froxlor-config',
-
'etc_exim4_conf.d_main_10_froxlor-config_options' =>
'/etc/exim4/conf.d/main/10_froxlor-config_options',
-
'etc_exim4_conf.d_router_180_froxlor-config' =>
'/etc/exim4/conf.d/router/180_froxlor-config',
-
'etc_exim4_conf.d_transport_30_froxlor-config' =>
'/etc/exim4/conf.d/transport/30_froxlor-config'
- ),
- 'commands_2' => array(
- 'chmod o-rx
/var/lib/exim4',
- 'chmod o-rx
/etc/exim4/conf.d/main/10_froxlor-config_options'
- ),
- 'restart' => array(
- '/etc/init.d/exim4
restart'
- )
)
)
),
- 'mail' => array(
+ 'mail' => Array(
'label' => $lng['admin']['configfiles']['mail'],
- 'daemons' => array(
- 'courier' => array(
+ 'daemons' => Array(
+ 'courier' => Array(
'label' => 'Courier',
- 'commands' => array(
- 'zypper install
courier-imap courier-authlib-mysql'
- ),
- 'files' => array(
+ 'files' => Array(
'etc_authlib_authdaemonrc' => '/etc/authlib/authdaemonrc',
'etc_authlib_authmysqlrc' => '/etc/authlib/authmysqlrc'
),
- 'restart' => array(
+ 'restart' => Array(
'/etc/init.d/courier-authdaemon restart',
'/etc/init.d/courier-pop restart'
)
),
- 'dovecot' => array(
- 'label' => 'Dovecot 1.1',
- 'commands_1' => array(
- 'zypper install
dovecot11'
- ),
- 'files' => array(
-
'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-
'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
- ),
- 'commands_2' => array(
- 'chmod 0640
/etc/dovecot/dovecot-sql.conf'
+ 'dovecot' => Array(
+ 'label' => 'Dovecot 2.1',
+ 'commands_1' => Array(
+ 'zypper install
dovecot21'
+ ),
+ 'files' => Array(
+
'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
+
'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
+ ),
+ 'commands_2' => Array(
+ 'chmod 0640
/etc/dovecot/dovecot-sql.conf'
+
+ ),
+ 'restart' => Array(
+ '/etc/init.d/dovecot
restart'
+ )
+ )
- ),
- 'restart' => array(
- '/etc/init.d/dovecot
restart'
- )
- )
)
),
- 'ftp' => array(
- 'label' => $lng['admin']['configfiles']['ftp'],
- 'daemons' => array(
- 'proftpd' => array(
- 'label' => 'ProFTPd',
- 'files' => array(
-
'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
-
'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
- ),
- 'restart' => array(
- '/etc/init.d/proftpd
restart'
- )
- ),
- 'pure-ftpd' => array(
- 'label' => 'Pure-FTPd',
- 'files' => array(
- 'etc_pure-ftpd.conf' =>
'/etc/pure-ftpd/pure-ftpd.conf',
-
'etc_pure-ftpd_mysql.conf' => '/etc/pure-ftpd/pure-ftpd-mysql.conf'
- ),
- 'restart' => array(
- '/etc/init.d/pure-ftpd
restart'
- )
- ),
+ 'ftp' => Array(
+ 'label' => $lng['admin']['configfiles']['ftp'],
+ 'daemons' => Array(
+ 'proftpd' => Array(
+ 'label' => 'ProFTPd',
+ 'files' => Array(
+
'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
+
'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
+ ),
+ 'restart' => Array(
+ '/etc/init.d/proftpd
restart'
+ )
+ ),
+ 'pure-ftpd' => Array(
+ 'label' => 'Pure-FTPd',
+ 'files' => Array(
+ 'etc_pure-ftpd.conf'
=> '/etc/pure-ftpd/pure-ftpd.conf',
+
'etc_pure-ftpd_mysql.conf' => '/etc/pure-ftpd/pure-ftpd-mysql.conf'
+ ),
+ 'restart' => Array(
+ '/etc/init.d/pure-ftpd
restart'
+ )
+ ),
)
),
- 'etc' => array(
+ 'etc' => Array(
'label' => $lng['admin']['configfiles']['etc'],
- 'daemons' => array(
- 'cron' => array(
+ 'daemons' => Array(
+ 'cron' => Array(
'label' => 'Crond (cronscript)',
- 'files' => array(
+ 'files' => Array(
'etc_cron.d_froxlor' =>
'/etc/cron.d/froxlor'
),
- 'restart' => array(
+ 'restart' => Array(
'/etc/init.d/cron
restart'
)
),
- 'awstats' => array(
+ 'awstats' => Array(
'label' => 'Awstats',
- 'commands' => array(
+ 'commands' => Array(
'cp
/usr/share/doc/packages/awstats/awstats.model.conf /etc/awstats/',
- 'sed -i.bak
\'s/^DirData/#
DirData/\''.makeCorrectFile(Settings::Get('system.awstats_conf').'/awstats.model.conf'),
- '# Please make sure you
deactivate awstats own cronjob as Froxlor handles that itself'
+
/**makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').'
'.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),*/
+ 'sed -i.bak
\'s/^DirData/#
DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+ 'cp awstats.model.conf
awstats.yourdomain.xx.conf #e.g one.example.com or example.com',
+ 'edit
awstats.yourdomain.xx.conf',
+ 'change
SiteDomain="yourdomain.xx #e.g SiteDomain="example.com" ',
+ 'change
HostAliases="yourdomain.xx www.yourdomain.de 127.0.0.1 localhost" ',
+ 'Set
DirIcons="/awstatsicons" ',
+ 'run awstats in your
favorite browser by http://yourdomain.xx/cgi-bin/awstats.pl'
)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/froxlor/lib/configfiles/suse.inc.php.future.201505
new/froxlor/lib/configfiles/suse.inc.php.future.201505
--- old/froxlor/lib/configfiles/suse.inc.php.future.201505 2014-05-21
11:53:02.000000000 +0200
+++ new/froxlor/lib/configfiles/suse.inc.php.future.201505 1970-01-01
01:00:00.000000000 +0100
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * copy of suse_linux_10_0 addapted fot opensuse11.x Andrej Semen
<ase...@suse.de>
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Florian Lippert <f...@syscp.org> (2003-2009)
- * @author Froxlor team <t...@froxlor.org> (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Configfiles
- * @version copy of suse_linux_10_0 addapted fot opensuse11.x Andrej Semen
<ase...@suse.de>
- */
-
-return Array(
- 'suse_linux_12_x' => Array(
- 'label' => 'openSUSE 12.x',
- 'services' => Array(
- 'http' => Array(
- 'label' => $lng['admin']['configfiles']['http'],
- 'daemons' => Array(
- 'apache' => Array(
- 'label' => 'Apache',
- 'commands' => Array(
-
//$configcommand['vhost'],
-
$configcommand['diroptions'],
-
$configcommand['includesuse'],
- 'mkdir -p ' .
$settings['system']['documentroot_prefix'],
- 'mkdir -p ' .
$settings['system']['logfiles_directory'],
- 'Add to
/etc/apache2/httpd.conf',
- 'Alias /froxlor
/srv/www/htdocs/froxlor',
- '#Alias /mail
/srv/www/htdocs/roundcubemail',
- '#Alias /webmail
/srv/www/htdocs/squirrelmail',
-
($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' .
$settings['system']['deactivateddocroot'] : ''
- ),
- 'restart' => Array(
- ' '.
- '/etc/init.d/apache2
restart'
- )
- ),
- )
- ),
- 'dns' => Array(
- 'label' => $lng['admin']['configfiles']['dns'],
- 'daemons' => Array(
- 'bind' => Array(
- 'label' => 'Bind9',
- 'commands' => Array(
- 'echo "include \"' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >>
/etc/named.conf',
- 'mkdir -p ' .
$settings['system']['bindconf_directory'] ,
- 'touch ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
- 'chown named:0 ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
- 'chmod 0600 ' .
$settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
- ),
- 'restart' => Array(
- '/etc/init.d/named
restart'
- )
- ),
- )
- ),
- 'smtp' => Array(
- 'label' => $lng['admin']['configfiles']['smtp'],
- 'daemons' => Array(
- 'postfix' => Array(
- 'label' => 'Postfix',
- 'files' => Array(
- 'etc_postfix_main.cf'
=> '/etc/postfix/main.cf',
-
'etc_postfix_mysql_virtual_alias_maps.cf' =>
'/etc/postfix/mysql_virtual_alias_maps.cf',
-
'etc_postfix_mysql_virtual_mailbox_domains.cf' =>
'/etc/postfix/mysql_virtual_mailbox_domains.cf',
-
'etc_postfix_mysql_virtual_mailbox_maps.cf' =>
'/etc/postfix/mysql_virtual_mailbox_maps.cf',
- 'etc_sasl2_smtpd.conf'
=> '/etc/sasl2/smtpd.conf'
- ),
- 'commands' => Array(
- 'mkdir -p
/var/spool/postfix/etc/pam.d',
- 'groupadd -g ' .
$settings['system']['vmail_gid'] . ' vmail',
- 'useradd -u ' .
$settings['system']['vmail_uid'] . ' -g vmail vmail',
- 'mkdir -p ' .
$settings['system']['vmail_homedir'],
- 'chown -R vmail:vmail '
. $settings['system']['vmail_homedir'],
- 'touch
/etc/postfix/mysql_virtual_alias_maps.cf',
- 'touch
/etc/postfix/mysql_virtual_mailbox_domains.cf',
- 'touch
/etc/postfix/mysql_virtual_mailbox_maps.cf',
- 'touch
/etc/sasl2/smtpd.conf',
- 'chmod 660
/etc/postfix/mysql_virtual_alias_maps.cf',
- 'chmod 660
/etc/postfix/mysql_virtual_mailbox_domains.cf',
- 'chmod 660
/etc/postfix/mysql_virtual_mailbox_maps.cf',
- 'chmod 660
/etc/sasl2/smtpd.conf',
- 'chgrp postfix
/etc/postfix/mysql_virtual_alias_maps.cf',
- 'chgrp postfix
/etc/postfix/mysql_virtual_mailbox_domains.cf',
- 'chgrp postfix
/etc/postfix/mysql_virtual_mailbox_maps.cf',
- 'chgrp postfix
/etc/sasl2/smtpd.conf'
- ),
- 'restart' => Array(
- '/etc/init.d/postfix
restart'
- )
- ),
- 'postfix_mxaccess' => Array(
- 'label' => 'Postfix MX-Access
(anti spam)',
- 'files' => Array(
- 'etc_postfix_mx_access'
=> '/etc/postfix/mx_access',
- 'etc_postfix_main.cf'
=> '/etc/postfix/main.cf'
- ),
- 'commands_1' => Array(
- 'postmap
/etc/postfix/mx_access'
- ),
- 'restart' => Array(
- '/etc/init.d/postfix
restart'
- )
- )
- )
- ),
- 'mail' => Array(
- 'label' => $lng['admin']['configfiles']['mail'],
- 'daemons' => Array(
- 'courier' => Array(
- 'label' => 'Courier',
- 'files' => Array(
-
'etc_authlib_authdaemonrc' => '/etc/authlib/authdaemonrc',
-
'etc_authlib_authmysqlrc' => '/etc/authlib/authmysqlrc'
- ),
- 'restart' => Array(
-
'/etc/init.d/courier-authdaemon restart',
-
'/etc/init.d/courier-pop restart'
- )
- ),
- 'dovecot' => Array(
- 'label' => 'Dovecot 2.1',
- 'commands_1' => Array(
- 'zypper install
dovecot21'
- ),
- 'files' => Array(
-
'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-
'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
- ),
- 'commands_2' => Array(
- 'chmod 0640
/etc/dovecot/dovecot-sql.conf'
-
- ),
- 'restart' => Array(
- '/etc/init.d/dovecot
restart'
- )
- )
-
- )
- ),
- 'ftp' => Array(
- 'label' => $lng['admin']['configfiles']['ftp'],
- 'daemons' => Array(
- 'proftpd' => Array(
- 'label' => 'ProFTPd',
- 'files' => Array(
-
'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
-
'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
- ),
- 'restart' => Array(
- '/etc/init.d/proftpd
restart'
- )
- ),
- 'pure-ftpd' => Array(
- 'label' => 'Pure-FTPd',
- 'files' => Array(
- 'etc_pure-ftpd.conf'
=> '/etc/pure-ftpd/pure-ftpd.conf',
-
'etc_pure-ftpd_mysql.conf' => '/etc/pure-ftpd/pure-ftpd-mysql.conf'
- ),
- 'restart' => Array(
- '/etc/init.d/pure-ftpd
restart'
- )
- ),
- )
- ),
- 'etc' => Array(
- 'label' => $lng['admin']['configfiles']['etc'],
- 'daemons' => Array(
- 'cron' => Array(
- 'label' => 'Crond (cronscript)',
- 'files' => Array(
- 'etc_cron.d_froxlor' =>
'/etc/cron.d/froxlor'
- ),
- 'restart' => Array(
- '/etc/init.d/cron
restart'
- )
- ),
- 'awstats' => Array(
- 'label' => 'Awstats',
- 'commands' => Array(
- 'cp
/usr/share/doc/packages/awstats/awstats.model.conf /etc/awstats/',
-
/**makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').'
'.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),*/
- 'sed -i.bak
\'s/^DirData/#
DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
- 'cp awstats.model.conf
awstats.yourdomain.xx.conf #e.g one.example.com or example.com',
- 'edit
awstats.yourdomain.xx.conf',
- 'change
SiteDomain="yourdomain.xx #e.g SiteDomain="example.com" ',
- 'change
HostAliases="yourdomain.xx www.yourdomain.de 127.0.0.1 localhost" ',
- 'Set
DirIcons="/awstatsicons" ',
- 'run awstats in your
favorite browser by http://yourdomain.xx/cgi-bin/awstats.pl'
- )
- )
- )
- )
- )
- )
-);
-
-?>
