From ecb8fc2c5b3c1b42e15e3e44d287a650ef3b6aa6 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 27 Jan 2016 05:18:26 -0500
Subject: [PATCH] removed orphaned SPF type from one last file Added sone lines to rmeoting api description file for dns (I hope thats correct...)
---
install/lib/installer_base.lib.php | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 9 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index a3640ab..d3b3364 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -133,7 +133,8 @@
//** Detect PHP-Version
public function get_php_version() {
- if(version_compare(PHP_VERSION, $this->min_php, '<')) return false; else return true;
+ if(version_compare(PHP_VERSION, $this->min_php, '<')) return false;
+ else return true;
}
//** Detect installed applications
@@ -369,6 +370,84 @@
}
+ }
+
+ public function detect_ips(){
+ global $conf;
+
+ exec("ip addr show | awk '/global/ { print $2 }' | cut -d '/' -f 1", $output, $retval);
+
+ if($retval == 0){
+ if(is_array($output) && !empty($output)){
+ foreach($output as $line){
+ $line = trim($line);
+ $ip_type = '';
+ if (filter_var($line, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+ $ip_type = 'IPv4';
+ }
+ if (filter_var($line, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+ $ip_type = 'IPv6';
+ }
+ if($ip_type == '') continue;
+ if($this->db->dbHost != $this->dbmaster->dbHost){
+ $this->dbmaster->query('INSERT INTO server_ip (
+ sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
+ sys_perm_other, server_id, client_id, ip_type, ip_address,
+ virtualhost, virtualhost_port
+ ) VALUES (
+ 1,
+ 1,
+ "riud",
+ "riud",
+ "",
+ ?,
+ 0,
+ ?,
+ ?,
+ "y",
+ "80,443"
+ )', $conf['server_id'], $ip_type, $line);
+ $server_ip_id = $this->dbmaster->insertID();
+ $this->db->query('INSERT INTO server_ip (
+ server_php_id, sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
+ sys_perm_other, server_id, client_id, ip_type, ip_address,
+ virtualhost, virtualhost_port
+ ) VALUES (
+ ?,
+ 1,
+ 1,
+ "riud",
+ "riud",
+ "",
+ ?,
+ 0,
+ ?,
+ ?,
+ "y",
+ "80,443"
+ )', $server_ip_id, $conf['server_id'], $ip_type, $line);
+ } else {
+ $this->db->query('INSERT INTO server_ip (
+ sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
+ sys_perm_other, server_id, client_id, ip_type, ip_address,
+ virtualhost, virtualhost_port
+ ) VALUES (
+ 1,
+ 1,
+ "riud",
+ "riud",
+ "",
+ ?,
+ 0,
+ ?,
+ ?,
+ "y",
+ "80,443"
+ )', $conf['server_id'], $ip_type, $line);
+ }
+ }
+ }
+ }
}
public function grant_master_database_rights($verbose = false) {
@@ -874,7 +953,7 @@
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
$configfile = $config_dir.'/master.cf';
if ($this->postfix_master()) {
- exec ("postconf -M maildrop.unix", $out, $ret);
+ exec ("postconf -M maildrop.unix &> /dev/null", $out, $ret);
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
} else { //* fallback - postfix < 2.9
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
@@ -1054,7 +1133,7 @@
$config_dir = $conf['postfix']['config_dir'];
//* Configure master.cf and add a line for deliver
if ($this->postfix_master()) {
- exec ("postconf -M dovecot.unix", $out, $ret);
+ exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
$add_dovecot_service = @($out[0]=='')?true:false;
} else { //* fallback - postfix < 2.9
$content = rf($config_dir.'/master.cf');
@@ -1196,13 +1275,13 @@
// Adding amavis-services to the master.cf file if the service does not already exists
if ($this->postfix_master()) {
- exec ("postconf -M amavis.unix", $out, $ret);
+ exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
$add_amavis = @($out[0]=='')?true:false;
unset($out);
- exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
+ exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
$add_amavis_10025 = @($out[0]=='')?true:false;
unset($out);
- exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
+ exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
$add_amavis_10027 = @($out[0]=='')?true:false;
unset($out);
} else { //* fallback - postfix < 2.9
@@ -1390,6 +1469,27 @@
}
+
+ //** writes bind configuration files
+ public function process_bind_file($configfile, $target='/', $absolute=false) {
+ global $conf;
+
+ if ($absolute) $full_file_name = $target.$configfile;
+ else $full_file_name = $conf['ispconfig_install_dir'].$target.$configfile;
+
+ //* Backup exiting file
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.$configfile.'~');
+ }
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+ $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
+ $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
+ $content = str_replace('{mysql_server_ispconfig_database}', $conf['mysql']['database'], $content);
+ $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
+ $content = str_replace('{ispconfig_install_dir}', $conf['ispconfig_install_dir'], $content);
+ $content = str_replace('{dnssec_conffile}', $conf['ispconfig_install_dir'].'/server/scripts/dnssec-config.sh', $content);
+ wf($full_file_name, $content);
+ }
public function configure_bind() {
global $conf;
@@ -1402,13 +1502,15 @@
//* Create the slave subdirectory
$content .= 'slave';
- if(!@is_dir($content)) mkdir($content, 2770, true);
+ if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']);
- chmod($content, 2770);
-
+ chmod($content, 02770);
+
+ //* Install scripts for dnssec implementation
+ $this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
}
--
Gitblit v1.9.1