Newer nagios and mailman configs

diff --git a/conf-available/nagios3.conf b/conf-available/nagios3.conf
deleted file mode 120000 (symlink)
index 958e697..0000000
--- a/conf-available/nagios3.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../nagios3/apache2.conf
\ No newline at end of file

diff --git a/conf-available/nagios4.conf b/conf-available/nagios4.conf
new file mode 120000 (symlink)
index 0000000..ea6da5c
--- /dev/null
+++ b/conf-available/nagios4.conf
@@ -0,0 +1 @@
+../../nagios4/apache2.conf
\ No newline at end of file

diff --git a/conf-enabled/nagios3.conf b/conf-enabled/nagios3.conf
deleted file mode 120000 (symlink)
index 6e92e63..0000000
--- a/conf-enabled/nagios3.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf-available/nagios3.conf
\ No newline at end of file

diff --git a/conf-enabled/nagios4.conf b/conf-enabled/nagios4.conf
new file mode 120000 (symlink)
index 0000000..b0bb44b
--- /dev/null
+++ b/conf-enabled/nagios4.conf
@@ -0,0 +1 @@
+../conf-available/nagios4.conf
\ No newline at end of file

diff --git a/mods-enabled/mailman.conf b/mods-enabled/mailman.conf
deleted file mode 120000 (symlink)
index 435695c..0000000
--- a/mods-enabled/mailman.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/mailman.conf
\ No newline at end of file

diff --git a/mods-enabled/mailman.load b/mods-enabled/mailman.load
deleted file mode 120000 (symlink)
index 94e7a78..0000000
--- a/mods-enabled/mailman.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/mailman.load
\ No newline at end of file

diff --git a/sites-common/default b/sites-common/default
index 47bfc1d5c3ebaeba1d4d4f71220404cd7ea2c3ac..0450314534b7defcfad287f6223538606e85d480 100644 (file)
--- a/sites-common/default
+++ b/sites-common/default
@@ -59,3 +59,4 @@ Alias /doc/ "/usr/share/doc/"
 </Directory>
 
 Include sites-common/awstats
+Include ../mailman3/apache.conf