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 old mode 100755 new mode 100644 index 71b887b..c085a3e --- 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 old mode 100755 new mode 100644 index 22e1e05..e2bf7a3 --- 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 old mode 100755 new mode 100644 index 811f7d7..79e8e03 --- 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 old mode 100755 new mode 100644 index 7661108..be19a20 --- 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"