summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot@culturestrings <root@culturestrings>2020-06-03 13:42:01 +0000
committerroot@culturestrings <root@culturestrings>2020-06-03 13:42:01 +0000
commit89dca39f896aec52d092a362266bd06d681c8d45 (patch)
tree94ea290d420ce5067e3f5d87400a65d97c5756eb
parentc35fa9be301ecead49f40ad530be433e2e5ca7f4 (diff)
downloadculturestrings-89dca39f896aec52d092a362266bd06d681c8d45.tar.bz2
culturestrings-89dca39f896aec52d092a362266bd06d681c8d45.tar.xz
openvpn: make the configuration file site-agnostic.
-rw-r--r--public/fs/etc/openvpn/culturestrings-conf.sh7
-rwxr-xr-xpublic/fs/etc/openvpn/hostvpn-conf.sh10
-rw-r--r--public/fs/etc/openvpn/hostvpn.conf.in (renamed from public/fs/etc/openvpn/culturestrings.conf.in)6
3 files changed, 13 insertions, 10 deletions
diff --git a/public/fs/etc/openvpn/culturestrings-conf.sh b/public/fs/etc/openvpn/culturestrings-conf.sh
deleted file mode 100644
index c085a3e..0000000
--- a/public/fs/etc/openvpn/culturestrings-conf.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-source /root/config/private/config/server.ports
-
-sed -e 's/@vpn_port@/'${vpn_port}'/g' "$1"
diff --git a/public/fs/etc/openvpn/hostvpn-conf.sh b/public/fs/etc/openvpn/hostvpn-conf.sh
new file mode 100755
index 0000000..1abfb1f
--- /dev/null
+++ b/public/fs/etc/openvpn/hostvpn-conf.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -eu
+
+source /root/config/private/config/server.ports
+source /root/config/private/config/hostname
+
+sed -e 's/@vpn_port@/'${vpn_port}'/g' \
+ -e 's/@hostname@/'${hostname}'/g' \
+ "$1"
diff --git a/public/fs/etc/openvpn/culturestrings.conf.in b/public/fs/etc/openvpn/hostvpn.conf.in
index eaea36b..a285e12 100644
--- a/public/fs/etc/openvpn/culturestrings.conf.in
+++ b/public/fs/etc/openvpn/hostvpn.conf.in
@@ -7,10 +7,10 @@ topology subnet
cipher AES-256-CBC
ca /etc/easy-rsa/pki/ca.crt
-cert /etc/easy-rsa/pki/issued/culturestrings.crt
+cert /etc/easy-rsa/pki/issued/@hostname@.crt
-askpass /srv/webroot/openvpn/culturestrings.pass
-key /etc/easy-rsa/pki/private/culturestrings.key
+askpass /srv/webroot/openvpn/@hostname@.pass
+key /etc/easy-rsa/pki/private/@hostname@.key
dh /etc/easy-rsa/pki/dh.pem
status /var/log/openvpn/openvpn-status.log