kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

Make shellcheck happy with the __jitsi_* types

Browse source
This commit is contained in:
fnux 2021-01-13 08:54:28 +01:00
parent a1620e8221
commit 87d4c33e26
No known key found for this signature in database
GPG key ID: 4502C902C00A1E12
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
type/__jitsi_meet/manifest
View file

@ -43,6 +43,7 @@ require="__apt_source/jitsi_meet" __apt_update_index
export require="${require} __apt_source/jitsi_meet __apt_update_index" export require="${require} __apt_source/jitsi_meet __apt_update_index"
# Pre-feed debconf settings, so Jitsi's installation has a good config # Pre-feed debconf settings, so Jitsi's installation has a good config
# shellcheck source=type/__jitsi_meet/files/debconf_settings.sh
. "${__type}/files/debconf_settings.sh" # This defines DEBCONF_SETTINGS . "${__type}/files/debconf_settings.sh" # This defines DEBCONF_SETTINGS
__debconf_set_selections jitsi_meet --file - <<EOF __debconf_set_selections jitsi_meet --file - <<EOF
${DEBCONF_SETTINGS} ${DEBCONF_SETTINGS}
@ -50,9 +51,7 @@ EOF
export require="${require} __debconf_set_selections/jitsi_meet" export require="${require} __debconf_set_selections/jitsi_meet"
# Install and upgrade packages as needed # Install and upgrade packages as needed
for pkg in jitsi-meet; do __package jitsi-meet
__package "${pkg}"
done
# Proceed only after installation/upgrade has finished # Proceed only after installation/upgrade has finished
export require="__package/jitsi-meet" export require="__package/jitsi-meet"
@ -182,6 +181,7 @@ EOF
esac esac
if [ "${PROMETHEUS_JITSI_EXPORTER_SHOULD_VERSION}" != \ if [ "${PROMETHEUS_JITSI_EXPORTER_SHOULD_VERSION}" != \
"${PROMETHEUS_JITSI_EXPORTER_IS_VERSION}" ]; then "${PROMETHEUS_JITSI_EXPORTER_IS_VERSION}" ]; then
# shellcheck disable=SC2059
__download \ __download \
/tmp/prometheus-jitsi-meet-exporter \ /tmp/prometheus-jitsi-meet-exporter \
--url "${PROMETHEUS_JITSI_EXPORTER_URL}" \ --url "${PROMETHEUS_JITSI_EXPORTER_URL}" \

2
type/__jitsi_meet_domain/manifest
View file

@ -47,6 +47,7 @@ __letsencrypt_cert "${DOMAIN}" \
--webroot /usr/share/jitsi-meet --webroot /usr/share/jitsi-meet
# Create virtualhost for nginx # Create virtualhost for nginx
# shellcheck source=type/__jitsi_meet_domain/files/nginx.sh
. "${__type}/files/nginx.sh" # This defines JITSI_NGINX_CONFIG . "${__type}/files/nginx.sh" # This defines JITSI_NGINX_CONFIG
require="__letsencrypt_cert/${DOMAIN}" __file \ require="__letsencrypt_cert/${DOMAIN}" __file \
"/etc/nginx/sites-enabled/${DOMAIN}.conf" \ "/etc/nginx/sites-enabled/${DOMAIN}.conf" \
@ -55,6 +56,7 @@ ${JITSI_NGINX_CONFIG}
EOF EOF
# Setup jitsi config # Setup jitsi config
# shellcheck source=type/__jitsi_meet_domain/files/config.js.sh
. "${__type}/files/config.js.sh" # This defines JITSI_CONFIG_JS . "${__type}/files/config.js.sh" # This defines JITSI_CONFIG_JS
__file "/etc/jitsi/meet/${DOMAIN}-config.js" \ __file "/etc/jitsi/meet/${DOMAIN}-config.js" \
--mode 0644 --source "-" <<EOF --mode 0644 --source "-" <<EOF