From: Jan Willamowius <jan@willamowius.de>
Date: Tue, 13 Sep 2005 15:32:21 +0000 (+0000)
Subject: correct installer
X-Git-Tag: spong-2_8_0-beta1~16
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c24cc4a47150d2f434ead53b46c52a98ea41ce;p=spong.git

correct installer
---

diff --git a/Makefile b/Makefile
index 0fdbd8c..4bb6a81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 2005/09/13 15:23:09 willamowius Exp $
+# $Id: Makefile,v 1.12 2005/09/13 15:32:21 willamowius Exp $
 #
 # Makefile for Spong (Version 2.6f and up).
 #
diff --git a/config.mk b/config.mk
index ea1d81c..d8810e2 100644
--- a/config.mk
+++ b/config.mk
@@ -1,4 +1,4 @@
-# $Id: config.mk,v 1.8 2005/09/13 15:23:09 willamowius Exp $
+# $Id: config.mk,v 1.9 2005/09/13 15:32:21 willamowius Exp $
 #
 # Test include for ./Makefile
 # Rename this "config.mk" for testing.
@@ -19,18 +19,18 @@ VARDIR=$(PREFIX)/var
 
 DBDIR=$(VARDIR)/database
 
-SPONGSERVER=janhh
+SPONGSERVER=spong-server.example.com
 
 #WEBDIR=./WEBDIR
 WEBDIR=$(PREFIX)
 WWWDIR=$(WEBDIR)/www
 CGIDIR=$(WEBDIR)/cgi-bin
 # Apache configuration
-DOMAIN=
-SERVER=janhh
-VSERVER=janhh
+DOMAIN=example.com
+SERVER=www.$(DOMAIN)
+VSERVER=spong.$(DOMAIN)
 ALIASES=spong
-ADMIN=jan@willamowius.de
+ADMIN=admin@$(DOMAIN)
 
 
 #DOCROOT=/www
diff --git a/spong.mk b/spong.mk
index b9cede3..b6e9776 100644
--- a/spong.mk
+++ b/spong.mk
@@ -1,9 +1,9 @@
-# $Id: spong.mk,v 1.9 2005/09/13 15:23:09 willamowius Exp $
+# $Id: spong.mk,v 1.10 2005/09/13 15:32:21 willamowius Exp $
 #
 #
 # Spong version
 
-SPONGVER=2.7.5
+SPONGVER=2.8.0
 
 #---- Operating system list [ should match ./config/spong.conf.$OS ]
 
@@ -73,6 +73,7 @@ WEBPAGES = \
 	$(WWWDIR)/html/home.html \
 	$(WWWDIR)/html/host.html \
 	$(WWWDIR)/html/http.html \
+	$(WWWDIR)/html/https.html \
 	$(WWWDIR)/html/imap.html \
 	$(WWWDIR)/html/jobs.html \
 	$(WWWDIR)/html/lan.html \