Hello community,

here is the log from the commit of package froxlor for openSUSE:Factory checked 
in at 2014-05-21 16:19:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-28 
16:22:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.froxlor.new/froxlor.changes     2014-05-21 
16:19:17.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 21 11:56:01 CEST 2014 - ase...@suse.de
+
+- updating frolxor howto link in idir/README.SUSE
+  fixing configuration file suse.inc.php
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ froxlor.spec ++++++
--- /var/tmp/diff_new_pack.WkouQe/_old  2014-05-21 16:19:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WkouQe/_new  2014-05-21 16:19:18.000000000 +0200
@@ -76,7 +76,7 @@
 #mkdir -p uploadfiles
 #chmod -R 707 images
 
-echo "froxlor installation see doc 
http://wiki.froxlor.org/contrib/opensuse-11.x"; > $idir/README.SUSE
+echo "froxlor installation see doc 
http://redmine.froxlor.org/projects/froxlor/wiki"; > $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
 

++++++ 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    2013-10-11 13:42:49.000000000 
+0200
+++ new/froxlor/lib/configfiles/suse.inc.php    2014-05-21 11:53:55.000000000 
+0200
@@ -1,90 +1,104 @@
 <?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).
+ * 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).
  *
  * 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-)
+ * @author     Andrej Semen <ase...@suse.de> (2010-2011)
+ * @author     Wolfgang Rosenauer <w...@rosenauer.org> (2011)
+ * @author     Froxlor team <t...@froxlor.org> (2011-)
  * @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(
+// 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(
                '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(
-                                                       
//$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'] : ''
+                                               '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') : ''
                                                ),
-                                               '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(
-                                                       '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'
+                                               'commands' => array(
+                                                       'Add froxlor_bind.conf 
to the NAMED_CONF_INCLUDE_FILES in /etc/sysconfig/named'
+
                                                ),
-                                               '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(
+                                               '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'),
                                                        '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/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',
@@ -95,108 +109,160 @@
                                                        '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',
-                                               'files' => Array(
+                                               'commands' => array(
+                                                       'zypper install 
courier-imap courier-authlib-mysql'
+                                               ),
+                                               '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 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'
-                                                )
-                                        )
+                                       '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'
 
+                                               ),
+                                               '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/',
-                                                       
/**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'
+                                                       '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'
                                                )
                                        )
                                )
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      1970-01-01 
01:00:00.000000000 +0100
+++ new/froxlor/lib/configfiles/suse.inc.php.future.201505      2014-05-21 
11:53:02.000000000 +0200
@@ -0,0 +1,208 @@
+<?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'
+                                               )
+                                       )
+                               )
+                       )
+               )
+       )
+);
+
+?>

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to