summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot@culturestrings <root@culturestrings>2020-06-03 13:15:45 +0000
committerroot@culturestrings <root@culturestrings>2020-06-03 13:15:45 +0000
commitb0963f5f143bd57a7f51e7c0e598815e0ffdd275 (patch)
tree84b77fe8d4cd89ef80e7bf47d22a6a91a086166a
parente9e3644d71ff6c89810a305231484b5021e0f3f4 (diff)
downloadculturestrings-b0963f5f143bd57a7f51e7c0e598815e0ffdd275.tar.bz2
culturestrings-b0963f5f143bd57a7f51e7c0e598815e0ffdd275.tar.xz
adjust config file references to the updated private section directory layout.
-rw-r--r--public/fs/etc/firehol/firehol.conf2
-rw-r--r--[-rwxr-xr-x]public/fs/etc/openvpn/culturestrings-conf.sh2
-rw-r--r--[-rwxr-xr-x]public/fs/etc/pagure/pagure-cfg.sh2
-rw-r--r--[-rwxr-xr-x]public/fs/etc/postfix/main-cf.sh2
-rw-r--r--[-rwxr-xr-x]public/fs/etc/ssh/sshd-config.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/public/fs/etc/firehol/firehol.conf b/public/fs/etc/firehol/firehol.conf
index 234d314..2b65da5 100644
--- a/public/fs/etc/firehol/firehol.conf
+++ b/public/fs/etc/firehol/firehol.conf
@@ -22,7 +22,7 @@ ipv4 blacklist full ipset:firehol_level1 ipset:firehol_level2
# services
###
-source /root/config/private/fs/etc/server.ports
+source /root/config/private/config/server.ports
server_ssh_ports="tcp/$ssh_port"
client_ssh_ports="default"
diff --git a/public/fs/etc/openvpn/culturestrings-conf.sh b/public/fs/etc/openvpn/culturestrings-conf.sh
index 71b887b..c085a3e 100755..100644
--- a/public/fs/etc/openvpn/culturestrings-conf.sh
+++ b/public/fs/etc/openvpn/culturestrings-conf.sh
@@ -2,6 +2,6 @@
set -eu
-source /root/config/private/fs/etc/server.ports
+source /root/config/private/config/server.ports
sed -e 's/@vpn_port@/'${vpn_port}'/g' "$1"
diff --git a/public/fs/etc/pagure/pagure-cfg.sh b/public/fs/etc/pagure/pagure-cfg.sh
index 22e1e05..e2bf7a3 100755..100644
--- a/public/fs/etc/pagure/pagure-cfg.sh
+++ b/public/fs/etc/pagure/pagure-cfg.sh
@@ -2,7 +2,7 @@
set -eu
-source /root/config/private/fs/etc/server.ports
+source /root/config/private/config/server.ports
source /root/config/private/keys/pagure/pagure.keys
sed -e 's/@ssh_port@/'${ssh_port}'/g' \
diff --git a/public/fs/etc/postfix/main-cf.sh b/public/fs/etc/postfix/main-cf.sh
index 811f7d7..79e8e03 100755..100644
--- a/public/fs/etc/postfix/main-cf.sh
+++ b/public/fs/etc/postfix/main-cf.sh
@@ -2,6 +2,6 @@
set -eu
-source /root/config/private/fs/etc/server.domains
+source /root/config/private/config/server.domains
sed -e 's/@server_domains@/'"${server_domains}"'/g' "$1"
diff --git a/public/fs/etc/ssh/sshd-config.sh b/public/fs/etc/ssh/sshd-config.sh
index 7661108..be19a20 100755..100644
--- a/public/fs/etc/ssh/sshd-config.sh
+++ b/public/fs/etc/ssh/sshd-config.sh
@@ -2,6 +2,6 @@
set -eu
-source /root/config/private/fs/etc/server.ports
+source /root/config/private/config/server.ports
sed -e 's/@ssh_port@/'${ssh_port}'/g' "$1"