diff options
| -rwxr-xr-x | tools/net_services | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/net_services b/tools/net_services index 334fb73..b51d5e8 100755 --- a/tools/net_services +++ b/tools/net_services @@ -8,8 +8,18 @@ root_dir="$(realpath "$script_dir/..")" # named volumes with it (e.g. `net_services_radicale_data`). project="net_services" +source_env() { + env_file="$script_dir/../.env" + if ! [[ -r "$env_file" ]]; then + echo "$env_file is missing" >&2 + exit 1 + fi + # shellcheck disable=1090 + source "$env_file" +} + # generate_self_signed_cert <domain> <crt_dst> <key_dst> [<subdomains>...] -_generate_self_signed_cert() { +generate_self_signed_cert() { local crt_dst=${1:?missing crt_dst argument} local key_dst=${2:?missing key_dst argument} local domain=${3:?missing domain argument} @@ -61,16 +71,6 @@ Match User git sudo systemctl restart sshd } -source_env() { - env_file="$script_dir/../.env" - if ! [[ -r "$env_file" ]]; then - echo "$env_file is missing" >&2 - exit 1 - fi - # shellcheck disable=1090 - source "$env_file" -} - init() { for service in nginx radicale; do tar -czf "$root_dir/services/$service/fs.tar.gz" -C "$root_dir/services/$service/fs" . @@ -98,11 +98,11 @@ init() { case $choice in OVH) read -rep "Enter path (relative or absolute) to your OVH API credentials:" ovh_api_creds_file - _generate_ovh_cert "$ovh_api_creds_file" "$NGINX__HOST" "${subdomains[@]}" + generate_ovh_cert "$ovh_api_creds_file" "$NGINX__HOST" "${subdomains[@]}" sudo ln --symbolic --relative --force "/etc/letsencrypt/live/$NGINX__HOST/fullchain.pem" /etc/letsencrypt/server.crt sudo ln --symbolic --relative --force "/etc/letsencrypt/live/$NGINX__HOST/privkey.pem" /etc/letsencrypt/server.key ;; - self-signed) _generate_self_signed_cert "$crt_file" "$key_file" "$NGINX__HOST" "${subdomains[@]}" ;; + self-signed) generate_self_signed_cert "$crt_file" "$key_file" "$NGINX__HOST" "${subdomains[@]}" ;; esac break done |