Update of /cvsroot/netpass/NetPass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22499
Modified Files:
Makefile install
Log Message:
yet another install bug, this one with the apache.conf edits
Index: Makefile
===================================================================
RCS file: /cvsroot/netpass/NetPass/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 4 May 2005 03:09:44 -0000 1.5
+++ Makefile 22 Dec 2005 21:12:21 -0000 1.6
@@ -1,5 +1,12 @@
dist:
- (cd .. ; tar -cp --exclude CVS -f netpass-`cat NetPass/VERSION`.tar NetPass)
+ (NPVERSION=`head -1 VERSION` ; \
+ NPBASEN=`basename $${PWD}` ; \
+ cd .. ; \
+ echo $${NPVERSION} $${NPBASEN} ; \
+ mv $${NPBASEN} NetPass-$${NPVERSION} ; \
+ tar -cp --exclude CVS -f NetPass-$${NPVERSION}.tar NetPass-$${NPVERSION} ; \
+ gzip -v -9 NetPass-$${NPVERSION}.tar ; \
+ mv NetPass-$${NPVERSION} $${NPBASEN} )
clean:
find . -name \*~ -exec rm -f {} \;
Index: install
===================================================================
RCS file: /cvsroot/netpass/NetPass/install,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- install 22 Dec 2005 19:29:52 -0000 1.28
+++ install 22 Dec 2005 21:12:21 -0000 1.29
@@ -1139,7 +1139,7 @@
ENTER to keep our value: ");
$MaxClients ||= $mc;
ll("Apache httpd.conf\nMaxClients=$MaxClients\n");
- apacheConfig_set(\@conf, '^#MaxClients', "MaxClients $MaxClients");
+ apacheConfig_set(\@conf, '^#MaxClients', "MaxClients $MaxClients\n");
# ^#ServerAdmin
@@ -1147,7 +1147,7 @@
my $ServerAdmin = ask ("Enter an email address of the person/group that administers this webserver: ");
ll ("ServerAdmin=$ServerAdmin\n");
- apacheConfig_set(\@conf, '^ServerAdmin', "ServerAdmin $ServerAdmin");
+ apacheConfig_set(\@conf, '^ServerAdmin', "ServerAdmin $ServerAdmin\n");
# ^#ServerName
@@ -1156,7 +1156,7 @@
real name.\n\n");
ll ("ServerName=$ServerName\n");
- apacheConfig_set(\@conf, '^ServerName', "ServerName $ServerName");
+ apacheConfig_set(\@conf, '^ServerName', "ServerName $ServerName\n");
#XXX
squidGuardConfig("/opt/squidguard/SquidGuard.conf", $ServerName);
|
