From 7d81ec4d8695b865830af0bb414dbe03a5052678 Mon Sep 17 00:00:00 2001 From: damencho Date: Wed, 7 Dec 2016 10:42:23 -0600 Subject: [PATCH] Simplifies dependencies, removes possible circular dependency. --- debian/control | 5 ++--- debian/jitsi-meet-web-config.docs | 4 ++++ debian/jitsi-meet-web-config.postinst | 6 +++--- debian/jitsi-meet-web.docs | 4 ---- 4 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 debian/jitsi-meet-web-config.docs diff --git a/debian/control b/debian/control index a20bfa29d..ae6fb168e 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,7 @@ Description: WebRTC JavaScript video conferences Package: jitsi-meet-web-config Architecture: all -Depends: openssl, openjdk-8-jre-headless | nginx | apache2, - jitsi-meet-web +Depends: openssl, openjdk-8-jre-headless | nginx | apache2 Description: Configuration for web serving of Jitsi Meet Jitsi Meet is a WebRTC JavaScript application that uses Jitsi Videobridge to provide high quality, scalable video conferences. @@ -37,7 +36,7 @@ Description: Configuration for web serving of Jitsi Meet Package: jitsi-meet-prosody Architecture: all -Depends: openssl, prosody | prosody-trunk, jitsi-meet-web +Depends: openssl, prosody | prosody-trunk Description: Prosody configuration for Jitsi Meet Jitsi Meet is a WebRTC JavaScript application that uses Jitsi Videobridge to provide high quality, scalable video conferences. diff --git a/debian/jitsi-meet-web-config.docs b/debian/jitsi-meet-web-config.docs new file mode 100644 index 000000000..520ee81e3 --- /dev/null +++ b/debian/jitsi-meet-web-config.docs @@ -0,0 +1,4 @@ +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.postinst b/debian/jitsi-meet-web-config.postinst index 72ed540a3..964444af0 100644 --- a/debian/jitsi-meet-web-config.postinst +++ b/debian/jitsi-meet-web-config.postinst @@ -94,7 +94,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.js $JITSI_MEET_CONFIG + cp /usr/share/doc/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG fi @@ -171,7 +171,7 @@ case "$1" in # nginx conf if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then - cp /usr/share/doc/jitsi-meet-web/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf + cp /usr/share/doc/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 @@ -202,7 +202,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/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf + cp /usr/share/doc/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 diff --git a/debian/jitsi-meet-web.docs b/debian/jitsi-meet-web.docs index cd786636a..b43bf86b5 100644 --- a/debian/jitsi-meet-web.docs +++ b/debian/jitsi-meet-web.docs @@ -1,5 +1 @@ README.md -doc/debian/jitsi-meet/jitsi-meet.example -doc/debian/jitsi-meet/jitsi-meet.example-apache -doc/debian/jitsi-meet/README -config.js