Disable SSH at the beginning.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1058 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/ssh-settings b/config/cfgroot/ssh-settings
index 6c9ef76650fc9b44459fa38ff35794665726ee39..83b8876dda4a8f97b30e7ee060a397d19446a649 100644 (file)
--- a/config/cfgroot/ssh-settings
+++ b/config/cfgroot/ssh-settings
@@ -2,5 +2,5 @@ ENABLE_SSH_KEYS=off
 ENABLE_SSH_PROTOCOL1=off
 ENABLE_SSH_PASSWORDS=on
 ENABLE_SSH_PORTFW=off
-ENABLE_SSH=on
+ENABLE_SSH=off
 __CGI__=CGI=HASH(0x840b7a0)

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index 556fed3a55632950c99906556936a7ba42fc761c..255e945b5604489b7920b54a6770ebd20108cbe0 100644 (file)
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -34,4 +34,3 @@ usr/lib/openssh/ssh-keysign
 #usr/man/man8/sshd.8
 usr/sbin/sshd
 #usr/share/Ssh.bin
-var/ipfire/remote/enablessh

diff --git a/lfs/openssh b/lfs/openssh
index 7ce9c63e6fc2cb33dee3eec80cbdf268e0139baa..5e2f6865d54fb15c2dcb2d9b6be9d9622055725f 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -89,7 +89,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
            -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
            /etc/ssh/sshd_config
-       touch /var/ipfire/remote/enablessh
-       chown nobody:nobody /var/ipfire/remote/enablessh
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)