From 339e1c5fab093ab7db64dc09ce6f6c4a2666c6c0 Mon Sep 17 00:00:00 2001 From: damencho Date: Sun, 17 Nov 2019 10:48:06 +0000 Subject: [PATCH] Moves config template files out of doc folder. --- debian/jitsi-meet-prosody.docs | 1 - debian/jitsi-meet-prosody.install | 3 ++- debian/jitsi-meet-prosody.postinst | 2 +- debian/jitsi-meet-web-config.docs | 3 --- debian/jitsi-meet-web-config.install | 3 +++ debian/jitsi-meet-web-config.postinst | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 debian/jitsi-meet-web-config.install diff --git a/debian/jitsi-meet-prosody.docs b/debian/jitsi-meet-prosody.docs index 0aee9cc9c..63f794a79 100644 --- a/debian/jitsi-meet-prosody.docs +++ b/debian/jitsi-meet-prosody.docs @@ -1,2 +1 @@ -doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example doc/debian/jitsi-meet-prosody/README diff --git a/debian/jitsi-meet-prosody.install b/debian/jitsi-meet-prosody.install index 4787c9967..de1a22dd9 100644 --- a/debian/jitsi-meet-prosody.install +++ b/debian/jitsi-meet-prosody.install @@ -1 +1,2 @@ -resources/prosody-plugins/ /usr/share/jitsi-meet/ +doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example /usr/share/jitsi-meet-prosody/ +resources/prosody-plugins/ /usr/share/jitsi-meet/ diff --git a/debian/jitsi-meet-prosody.postinst b/debian/jitsi-meet-prosody.postinst index fe824054a..7115f28c8 100644 --- a/debian/jitsi-meet-prosody.postinst +++ b/debian/jitsi-meet-prosody.postinst @@ -93,7 +93,7 @@ case "$1" in PROSODY_CONFIG_PRESENT="false" mkdir -p /etc/prosody/conf.avail/ mkdir -p /etc/prosody/conf.d/ - cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG + cp /usr/share/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG diff --git a/debian/jitsi-meet-web-config.docs b/debian/jitsi-meet-web-config.docs index 520ee81e3..690648e25 100644 --- a/debian/jitsi-meet-web-config.docs +++ b/debian/jitsi-meet-web-config.docs @@ -1,4 +1 @@ -doc/debian/jitsi-meet/jitsi-meet.example -doc/debian/jitsi-meet/jitsi-meet.example-apache doc/debian/jitsi-meet/README -config.js diff --git a/debian/jitsi-meet-web-config.install b/debian/jitsi-meet-web-config.install new file mode 100644 index 000000000..1e912017a --- /dev/null +++ b/debian/jitsi-meet-web-config.install @@ -0,0 +1,3 @@ +doc/debian/jitsi-meet/jitsi-meet.example /usr/share/jitsi-meet-web-config/ +doc/debian/jitsi-meet/jitsi-meet.example-apache /usr/share/jitsi-meet-web-config/ +config.js /usr/share/jitsi-meet-web-config/ diff --git a/debian/jitsi-meet-web-config.postinst b/debian/jitsi-meet-web-config.postinst index 7cc0a0be0..36cbae291 100644 --- a/debian/jitsi-meet-web-config.postinst +++ b/debian/jitsi-meet-web-config.postinst @@ -98,7 +98,7 @@ case "$1" in # jitsi meet JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js" if [ ! -f $JITSI_MEET_CONFIG ] ; then - cp /usr/share/doc/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG + cp /usr/share/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG fi @@ -177,7 +177,7 @@ case "$1" in # nginx conf if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then - cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf + cp /usr/share/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf fi @@ -208,7 +208,7 @@ case "$1" in if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then # when creating new config, make sure all needed modules are enabled a2enmod rewrite ssl headers proxy_http include - cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf + cp /usr/share/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf a2ensite $JVB_HOSTNAME.conf sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf fi