From 603bcbfdb00a6836598d25cbfa2873c67535826f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Sep 2010 06:44:02 -0400
Subject: [PATCH] Fixed: FS#1272 - No phpMyAdmin icon is listed in the database list.
---
install/lib/installer_base.lib.php | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index e6409ae..3d3b60e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -936,7 +936,20 @@
public function configure_bind() {
global $conf;
- //* Nothing to do
+ //* Check if the zonefile directory has a slash at the end
+ $content=$conf['bind']['bind_zonefiles_dir'];
+ if(substr($content,-1,1) != '/') {
+ $content .= '/';
+ }
+
+ //* Create the slave subdirectory
+ $content .= 'slave';
+ $content_mkdir = 'mkdir -p '.$content;
+ exec($content_mkdir);
+
+ //* Chown the slave subdirectory to $conf['bind']['bind_user']
+ exec('chown '.$conf['bind']['bind_user'].':'.$conf['bind']['bind_group'].' '.$content);
+ exec('chmod 770 '.$content);
}
@@ -1152,6 +1165,25 @@
}
+ }
+
+ public function make_ispconfig_ssl_cert() {
+ global $conf;
+
+ $ssl_crt_file = '/usr/local/ispconfig/interface/ssl/ispserver.crt';
+ $ssl_csr_file = '/usr/local/ispconfig/interface/ssl/ispserver.csr';
+ $ssl_key_file = '/usr/local/ispconfig/interface/ssl/ispserver.key';
+
+ if(!is_dir('/usr/local/ispconfig/interface/ssl')) exec("mkdir -p /usr/local/ispconfig/interface/ssl");
+
+ $ssl_pw = substr(md5(mt_rand()),0,6);
+ exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
+ exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -out $ssl_csr_file");
+ exec("openssl req -x509 -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -in $ssl_csr_file -out $ssl_crt_file -days 3650");
+ exec("openssl rsa -passin pass:$ssl_pw -in $ssl_key_file -out $ssl_key_file.insecure");
+ exec("mv $ssl_key_file $ssl_key_file.secure");
+ exec("mv $ssl_key_file.insecure $ssl_key_file");
+
}
public function install_ispconfig() {
@@ -1382,6 +1414,12 @@
} else {
$content = str_replace('{vhost_port_listen}', '', $content);
}
+
+ if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
+ $content = str_replace('{ssl_comment}', '', $content);
+ } else {
+ $content = str_replace('{ssl_comment}', '#', $content);
+ }
wf("$vhost_conf_dir/ispconfig.vhost", $content);
--
Gitblit v1.9.1