diff options
| -rw-r--r-- | satellit_installer/includes/70_write_tmate_config.inc | 12 | ||||
| -rwxr-xr-x | satellit_installer/satellit_installer | 5 | ||||
| -rw-r--r-- | satellit_upgrader/updater.template.sh | 13 |
3 files changed, 27 insertions, 3 deletions
diff --git a/satellit_installer/includes/70_write_tmate_config.inc b/satellit_installer/includes/70_write_tmate_config.inc new file mode 100644 index 0000000..bd68ef4 --- /dev/null +++ b/satellit_installer/includes/70_write_tmate_config.inc @@ -0,0 +1,12 @@ +write_tmate_config() { + echo -n "# Writing tmate config... " + [ -d /root/.tmate.conf ] && mv /root/.tmate.conf.old # Unnecessary here, but... + cat > /root/.tmate.conf <<-JUSTANOTHERDOC + set -g tmate-server-host "tmate.ruf.uni-freiburg.de" + set -g tmate-server-port 2222 + set -g tmate-server-rsa-fingerprint "d7:d7:06:d0:b6:0d:75:a1:ad:ec:69:18:b3:a3:c0:4a" + set -g tmate-server-ecdsa-fingerprint "4f:c9:81:f1:1a:20:7d:6f:97:12:f2:a9:0f:f4:c5:6c" + set -g tmate-identity "" + JUSTANOTHERDOC + echo "done." +} diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer index d5c2aae..e474e5d 100755 --- a/satellit_installer/satellit_installer +++ b/satellit_installer/satellit_installer @@ -104,8 +104,7 @@ set_version_string # Writing version string for rc.local-script preset_mysql_root # so mysqld keeps quiet when installing -# Adding repos: backports -add_repos +add_repos # Adding repos: backports install_packages NOREC "$PACKAGELIST_SERVER" # Packages needed for server installable without # recommended packages, so option NOREC is set. @@ -129,6 +128,8 @@ copy_atftpd_service patch_lighttpd_config "$WWWDIR" # $1: lighttpd http root patch_php_config +write_tmate_config # here or elsewhere... + patch_ldapsearch write_apt_config diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index 669821d..85e87a2 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -341,9 +341,20 @@ fi echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/10-added_repos.list apt-get update || pwarning "Adding backborts repo: update failed" && \ echo "Repository backports added." -apt-get install tmate || pwarning "Could not install tmate. Please check whether repo backports was added and install ba hand." && \ +apt-get install tmate || pwarning "Could not install tmate. Please check whether repo backports was added and install by hand." && \ echo "tmate istalled." +write_tmate_config() { + [ -d /root/.tmate.conf ] && mv /root/.tmate.conf.old + cat > /root/.tmate.conf <<-JUSTANOTHERDOC + set -g tmate-server-host "tmate.ruf.uni-freiburg.de" + set -g tmate-server-port 2222 + set -g tmate-server-rsa-fingerprint "d7:d7:06:d0:b6:0d:75:a1:ad:ec:69:18:b3:a3:c0:4a" + set -g tmate-server-ecdsa-fingerprint "4f:c9:81:f1:1a:20:7d:6f:97:12:f2:a9:0f:f4:c5:6c" + set -g tmate-identity "" + JUSTANOTHERDOC +} + # ************************ sudo config ********************* if [ -n "$FILEDIR/tm-sudo-config" ]; then cp -f "$FILEDIR/tm-sudo-config" "/etc/sudoers.d/taskmanager" || pwarning "Could not update sudo conf for taskmanager" |