From 1b063ee9dc97ab39049d7396ca87ba506435aca0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 6 Jan 2008 18:50:04 +0000
Subject: [PATCH] Moved server modules and plugins to new directory and updated
the installer to create the symlinks for the modules and plugins from
*-available to *-enabled directory. Fixed a typo in mailfilter template.
---
install/lib/installer_base.lib.php | 37 +++++++++++++++----
install/tpl/mailfilter.master | 2 +-
.../client_module.inc.php | 0
.../mail_module.inc.php | 0
.../server_module.inc.php | 0
.../web_module.inc.php | 0
.../apache2_plugin.inc.php | 0
.../getmail_plugin.inc.php | 0
.../mail_plugin.inc.php | 0
.../maildrop_plugin.inc.php | 0
.../postfix_filter_plugin.inc.php | 0
.../postfix_server_plugin.inc.php | 0
.../shelluser_plugin.inc.php | 0
13 files changed, 30 insertions(+), 9 deletions(-)
rename server/{mods-enabled => mods-available}/client_module.inc.php (100%)
rename server/{mods-enabled => mods-available}/mail_module.inc.php (100%)
rename server/{mods-enabled => mods-available}/server_module.inc.php (100%)
rename server/{mods-enabled => mods-available}/web_module.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/apache2_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/getmail_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/mail_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/maildrop_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/postfix_filter_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/postfix_server_plugin.inc.php (100%)
rename server/{plugins-enabled => plugins-available}/shelluser_plugin.inc.php (100%)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index fab5277430..2fdab33b38 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -42,7 +42,7 @@ class installer_base {
$this->conf = $conf;
}
- //TODO uh ?
+ //: TODO Implement the translation function and langauge files for the installer.
public function lng($text)
{
return $text;
@@ -100,19 +100,15 @@ class installer_base {
return $answer;
}
+ /*
// TODO: this function is not used atmo I think - pedro
function request_language(){
swriteln(lng('Enter your language'));
swriteln(lng('de, en'));
- /*
- do {
- $lang = sread(2);
- } while (!$this->check_break($lang) or $this->
- */
-
}
+ */
/** Create the database for ISPConfig */
public function configure_database()
@@ -608,6 +604,31 @@ class installer_base {
$content = str_replace('{server_id}', $this->conf['server_id'], $content);
wf("$install_dir/server/lib/$configfile", $content);
+ //* Enable the server modules and plugins.
+ // TODO: Implement a selector which modules and plugins shall be enabled.
+ $dir = $install_dir.'/server/mods-available/';
+ if (is_dir($dir)) {
+ if ($dh = opendir($dir)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file != '.' && $file != '..') {
+ symlink($install_dir.'/server/mods-enabled/'.$file,$install_dir.'/server/mods-available/'.$file)
+ }
+ }
+ closedir($dh);
+ }
+ }
+
+ $dir = $install_dir.'/server/plugins-available/';
+ if (is_dir($dir)) {
+ if ($dh = opendir($dir)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file != '.' && $file != '..') {
+ symlink($install_dir.'/server/plugins-enabled/'.$file,$install_dir.'/server/plugins-available/'.$file)
+ }
+ }
+ closedir($dh);
+ }
+ }
//* Chmod the files
$command = "chmod -R 750 $install_dir";
@@ -632,7 +653,7 @@ class installer_base {
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
//* Copy the ISPConfig vhost for the controlpanel
- //TODO These are missing! should they be "vhost_dist_*_dir" ?
+ // TODO: These are missing! should they be "vhost_dist_*_dir" ?
$vhost_conf_dir = $this->conf['apache']['vhost_conf_dir'];
$vhost_conf_enabled_dir = $this->conf['apache']['vhost_conf_enabled_dir'];
copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
diff --git a/install/tpl/mailfilter.master b/install/tpl/mailfilter.master
index 32a3eca43f..7a186426d9 100644
--- a/install/tpl/mailfilter.master
+++ b/install/tpl/mailfilter.master
@@ -50,7 +50,7 @@ if ( $RETURNCODE == 0 )
#
-# Check that user has his own maildrop include,
+# Test if the user has his own maildrop include,
# if not available, check if $DEFAULT is set
# (newer maildrop get's that from the DB and updates
# it) and deliver or fail temporarily if not available
diff --git a/server/mods-enabled/client_module.inc.php b/server/mods-available/client_module.inc.php
similarity index 100%
rename from server/mods-enabled/client_module.inc.php
rename to server/mods-available/client_module.inc.php
diff --git a/server/mods-enabled/mail_module.inc.php b/server/mods-available/mail_module.inc.php
similarity index 100%
rename from server/mods-enabled/mail_module.inc.php
rename to server/mods-available/mail_module.inc.php
diff --git a/server/mods-enabled/server_module.inc.php b/server/mods-available/server_module.inc.php
similarity index 100%
rename from server/mods-enabled/server_module.inc.php
rename to server/mods-available/server_module.inc.php
diff --git a/server/mods-enabled/web_module.inc.php b/server/mods-available/web_module.inc.php
similarity index 100%
rename from server/mods-enabled/web_module.inc.php
rename to server/mods-available/web_module.inc.php
diff --git a/server/plugins-enabled/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/apache2_plugin.inc.php
rename to server/plugins-available/apache2_plugin.inc.php
diff --git a/server/plugins-enabled/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/getmail_plugin.inc.php
rename to server/plugins-available/getmail_plugin.inc.php
diff --git a/server/plugins-enabled/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/mail_plugin.inc.php
rename to server/plugins-available/mail_plugin.inc.php
diff --git a/server/plugins-enabled/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/maildrop_plugin.inc.php
rename to server/plugins-available/maildrop_plugin.inc.php
diff --git a/server/plugins-enabled/postfix_filter_plugin.inc.php b/server/plugins-available/postfix_filter_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/postfix_filter_plugin.inc.php
rename to server/plugins-available/postfix_filter_plugin.inc.php
diff --git a/server/plugins-enabled/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/postfix_server_plugin.inc.php
rename to server/plugins-available/postfix_server_plugin.inc.php
diff --git a/server/plugins-enabled/shelluser_plugin.inc.php b/server/plugins-available/shelluser_plugin.inc.php
similarity index 100%
rename from server/plugins-enabled/shelluser_plugin.inc.php
rename to server/plugins-available/shelluser_plugin.inc.php
--
GitLab