Revision: 7762
http://sourceforge.net/p/ipcop/svn/7762
Author: owes
Date: 2014-12-29 08:13:26 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Re-sort restrictions. Tweak ntp.conf during upgrade.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/time.cgi
ipcop/trunk/src/scripts/upgrade.sh
ipcop/trunk/updates/2.1.8/setup
Modified: ipcop/trunk/html/cgi-bin/time.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/time.cgi 2014-12-22 08:43:53 UTC (rev 7761)
+++ ipcop/trunk/html/cgi-bin/time.cgi 2014-12-29 08:13:26 UTC (rev 7762)
@@ -321,7 +321,7 @@
print FILE "# Configuration file for ntpd, created by time.cgi.\n";
print FILE "# Do not edit manually.\n";
print FILE "#\n";
- print FILE "restrict default kod nomodify notrap nopeer noquery limited\n";
+ print FILE "restrict default kod limited nomodify nopeer noquery notrap\n";
print FILE "restrict 127.0.0.1\n";
print FILE "# Our networks\n";
Modified: ipcop/trunk/src/scripts/upgrade.sh
===================================================================
--- ipcop/trunk/src/scripts/upgrade.sh 2014-12-22 08:43:53 UTC (rev 7761)
+++ ipcop/trunk/src/scripts/upgrade.sh 2014-12-29 08:13:26 UTC (rev 7762)
@@ -33,8 +33,9 @@
/bin/sed -i -e "s+^fudge\s*127\.127\.1\.0.*+fudge 127.127.1.0 stratum 7+"
\
-e "s+^driftfile.*+driftfile /var/log/ntp/drift+"
/var/ipcop/time/ntp.conf
- # Modify server restrictions (1.9.18)
- /bin/sed -i -e "s+^restrict default ignore.*+restrict default kod nomodify
notrap nopeer noquery+" \
+ # Modify server restrictions (1.9.18 and 2.1.8)
+ /bin/sed -i -e "s+^restrict default.*+restrict default kod limited
nomodify nopeer noquery notrap+" \
+ -e "s+nomodify notrap+nomodify noquery notrap+" \
-e "/^restrict.*mask 255\.255\.255\.255.*/ d"
/var/ipcop/time/ntp.conf
fi
Modified: ipcop/trunk/updates/2.1.8/setup
===================================================================
--- ipcop/trunk/updates/2.1.8/setup 2014-12-22 08:43:53 UTC (rev 7761)
+++ ipcop/trunk/updates/2.1.8/setup 2014-12-29 08:13:26 UTC (rev 7762)
@@ -75,7 +75,7 @@
# /sbin/mkinitramfs --with-kernel=2.6.32-2 --with-firmware --many-modules
--with-list=/etc/modules.initramfs
# Adjust the changed config files
-# /usr/local/bin/upgrade.sh
+/usr/local/bin/upgrade.sh
# Remove certificates
/bin/rm -f /usr/share/ca-certificates/mozilla/Entrust.net_Secure_Server_CA.crt
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
