summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-25 17:11:38 +0200
committerSimon Rettberg2019-10-25 17:11:38 +0200
commitecc12dcfd5861c43d3662af79bc8698a30f48e78 (patch)
tree816ed6a7f5dfd3c3688e4e2e2f10fb4bd405f70c
parent[SSPS] Remove duplicate function (already in 10-handle_mysql.inc) (diff)
downloadsetup-scripts-ecc12dcfd5861c43d3662af79bc8698a30f48e78.tar.gz
setup-scripts-ecc12dcfd5861c43d3662af79bc8698a30f48e78.tar.xz
setup-scripts-ecc12dcfd5861c43d3662af79bc8698a30f48e78.zip
[SSPS] Add dnbd3 ssl tunnel to master server via socat
-rw-r--r--satellit_installer/includes/00-variables.inc2
-rw-r--r--satellit_installer/includes/50-install_dnbd3-server.inc5
-rw-r--r--satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service10
3 files changed, 16 insertions, 1 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index 2042aa7..66867e9 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -23,7 +23,7 @@ PACKAGELIST_SERVER="
sudo php-common php-mysqlnd php-cli nfs-kernel-server curl
nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg
libowfat-dev libssl-dev gcc make liblzma-dev tftpd-hpa tmate php-xml net-tools
- libjansson4 php-soap mtools
+ libjansson4 php-soap mtools socat
"
# Enter here packages needing installation of recommended packages as determines by apt-get:
diff --git a/satellit_installer/includes/50-install_dnbd3-server.inc b/satellit_installer/includes/50-install_dnbd3-server.inc
index 2929ed3..86deb5a 100644
--- a/satellit_installer/includes/50-install_dnbd3-server.inc
+++ b/satellit_installer/includes/50-install_dnbd3-server.inc
@@ -4,6 +4,11 @@ install_dnbd3-server_service() {
echo "# Linking dnbd3-server service file into (/etc/systemd/system/)multi-user.target.wants..."
ln -s /etc/systemd/system/dnbd3-server.service /etc/systemd/system/multi-user.target.wants/dnbd3-server.service \
|| perror "Could not link dnbd3-server service file into multiuser target!"
+ echo "# copying dnbd3-master-proxy service file..."
+ cp -p "$BASEDIR/static_files/dnbd3/dnbd3-master-proxy.service" /etc/systemd/system/dnbd3-master-proxy.service || perror "failed."
+ echo "# Linking dnbd3-master-proxy service file into (/etc/systemd/system/)multi-user.target.wants..."
+ ln -s /etc/systemd/system/dnbd3-master-proxy.service /etc/systemd/system/multi-user.target.wants/dnbd3-master-proxy.service \
+ || perror "Could not link dnbd3-master-proxy service file into multiuser target!"
}
install_dnbd3-server() {
diff --git a/satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service b/satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service
new file mode 100644
index 0000000..332f64d
--- /dev/null
+++ b/satellit_installer/static_files/dnbd3/dnbd3-master-proxy.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSL Proxy for DNBD3 on bwLehrpool Master-Server
+
+[Service]
+User=nobody
+ExecStart=/usr/bin/socat tcp-listen:5005,bind=127.0.0.1,fork,reuseaddr openssl-connect:bwlp-masterserver.ruf.uni-freiburg.de:5006,capath=/etc/ssl/certs/
+Restart=always
+
+[Install]
+WantedBy=multi-user.target