1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00

Script updates

This commit is contained in:
Darren Shepherd
2015-02-22 20:59:26 -07:00
parent dcf9d24415
commit d2dd4db6b1
11 changed files with 132 additions and 10 deletions

View File

@@ -24,6 +24,8 @@ setup_ssh()
fi
fi
done
mkdir -p /var/run/sshd
}
@@ -50,4 +52,12 @@ if [ ! -d ${RANCHER_HOME} ]; then
chmod 2755 ${RANCHER_HOME}
fi
if ! grep -q "$(hostname)" /etc/hosts; then
echo 127.0.1.1 $(hostname) >> /etc/hosts
fi
if [ -x /opt/rancher/bin/start.sh ]; then
/opt/rancher/bin/start.sh
fi
exec respawn -f /etc/respawn.conf

View File

@@ -42,7 +42,9 @@ if [ "$USE_TLS" == "true" ]; then
rancherctl config set -- userdocker.tls_server_cert "$TLS_SERVER_CERT"
rancherctl config set -- userdocker.tls_server_key "$TLS_SERVER_KEY"
exec >/var/log/userdocker.log 2>&1
exec docker -d -s overlay --tlsverify --tlscacert=$TLS_PATH/ca.pem --tlscert=$TLS_PATH/server-cert.pem --tlskey=$TLS_PATH/server-key.pem -H=0.0.0.0:2376 -H=unix:///var/run/docker.sock -G docker
else
exec >/var/log/userdocker.log 2>&1
exec docker -d -s overlay -G docker
fi

View File

@@ -0,0 +1,67 @@
# /etc/inputrc - global inputrc for libreadline
# See readline(3readline) and `info rluserman' for more information.
# Be 8 bit clean.
set input-meta on
set output-meta on
# To allow the use of 8bit-characters like the german umlauts, uncomment
# the line below. However this makes the meta key not work as a meta key,
# which is annoying to those which don't need to type in 8-bit characters.
# set convert-meta off
# try to enable the application keypad when it is called. Some systems
# need this to enable the arrow keys.
# set enable-keypad on
# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys
# do not bell on tab-completion
# set bell-style none
# set bell-style visible
# some defaults / modifications for the emacs mode
$if mode=emacs
# allow the use of the Home/End keys
"\e[1~": beginning-of-line
"\e[4~": end-of-line
# allow the use of the Delete/Insert keys
"\e[3~": delete-char
"\e[2~": quoted-insert
# mappings for "page up" and "page down" to step to the beginning/end
# of the history
# "\e[5~": beginning-of-history
# "\e[6~": end-of-history
# alternate mappings for "page up" and "page down" to search the history
# "\e[5~": history-search-backward
# "\e[6~": history-search-forward
# mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
"\e[1;5C": forward-word
"\e[1;5D": backward-word
"\e[5C": forward-word
"\e[5D": backward-word
"\e\e[C": forward-word
"\e\e[D": backward-word
$if term=rxvt
"\e[7~": beginning-of-line
"\e[8~": end-of-line
"\eOc": forward-word
"\eOd": backward-word
$endif
# for non RH/Debian xterm, can't hurt for RH/Debian xterm
# "\eOH": beginning-of-line
# "\eOF": end-of-line
# for freebsd console
# "\e[H": beginning-of-line
# "\e[F": end-of-line
$endif

View File

@@ -2,4 +2,4 @@
set -x -e
exec syslogd -n
exec rsyslogd -n