From 0a05a5a6eeb4e75a12c8fe71f428d20819e287d6 Mon Sep 17 00:00:00 2001 From: "root@culturestrings" Date: Sat, 13 Jun 2020 22:01:11 +0000 Subject: /root/config/private/config/hostname ==> /root/config/private/config/hostinfo/*. --- public/fs/etc/openvpn/hostvpn-conf.sh | 9 +++++++-- public/fs/etc/pagure/pagure-cfg.sh | 9 +++++++-- public/fs/etc/pagure/pagure.cfg.in | 1 + public/fs/etc/postfix/main-cf.sh | 9 +++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/public/fs/etc/openvpn/hostvpn-conf.sh b/public/fs/etc/openvpn/hostvpn-conf.sh index 1abfb1f..cdfdb1c 100755 --- a/public/fs/etc/openvpn/hostvpn-conf.sh +++ b/public/fs/etc/openvpn/hostvpn-conf.sh @@ -2,9 +2,14 @@ set -eu +sitezone="$1" + +cfg_script="$0" +cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P) + source /root/config/private/config/server.ports -source /root/config/private/config/hostname +source /root/config/private/config/hostinfo/${sitezone} sed -e 's/@vpn_port@/'${vpn_port}'/g' \ -e 's/@hostname@/'${hostname}'/g' \ - "$1" + "${cfg_srcdir}/hostvpn.conf.in" diff --git a/public/fs/etc/pagure/pagure-cfg.sh b/public/fs/etc/pagure/pagure-cfg.sh index ae15d36..bdaea8a 100755 --- a/public/fs/etc/pagure/pagure-cfg.sh +++ b/public/fs/etc/pagure/pagure-cfg.sh @@ -2,9 +2,14 @@ set -eu -source /root/config/private/config/hostname +sitezone="$1" + +cfg_script="$0" +cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P) + source /root/config/private/config/server.ports source /root/config/private/keys/pagure/pagure.keys +source /root/config/private/config/hostinfo/${sitezone} sed -e 's/@ssh_port@/'${ssh_port}'/g' \ -e 's/@pagure_flask_key@/'${pagure_flask_key}'/g' \ @@ -17,6 +22,6 @@ sed -e 's/@ssh_port@/'${ssh_port}'/g' \ -e 's/@docssite@/'${docssite}'/g' \ -e 's/@docszone@/'${docszone}'/g' \ -e 's/@devadmin@/'${devadmin}'/g' \ - "$1" + "${cfg_srcdir}/pagure.cfg.in" cat /root/config/private/config/pagure_ssh.pub diff --git a/public/fs/etc/pagure/pagure.cfg.in b/public/fs/etc/pagure/pagure.cfg.in index d17a347..bfc1122 100644 --- a/public/fs/etc/pagure/pagure.cfg.in +++ b/public/fs/etc/pagure/pagure.cfg.in @@ -159,3 +159,4 @@ SSH_KEYS_OPTIONS = ( 'restrict,command="/usr/lib/pagure/aclchecker.py %(username)s"' ) + diff --git a/public/fs/etc/postfix/main-cf.sh b/public/fs/etc/postfix/main-cf.sh index 840aa9a..da64a67 100755 --- a/public/fs/etc/postfix/main-cf.sh +++ b/public/fs/etc/postfix/main-cf.sh @@ -2,9 +2,14 @@ set -eu +sitezone="$1" + +cfg_script="$0" +cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P) + source /root/config/private/config/server.domains -source /root/config/private/config/hostname +source /root/config/private/config/hostinfo/${sitezone} sed -e 's/@server_domains@/'"${server_domains}"'/g' \ -e 's/@smtphost@/'"${smtphost}"'/g' \ - "$1" + "${cfg_srcdir}/main.cf.in" -- cgit v1.2.3