Browse Source

Simplifies dependencies, removes possible circular dependency.

master
damencho 8 years ago
parent
commit
7d81ec4d86

+ 2
- 3
debian/control View File

@@ -21,8 +21,7 @@ Description: WebRTC JavaScript video conferences
21 21
 
22 22
 Package: jitsi-meet-web-config
23 23
 Architecture: all
24
-Depends: openssl, openjdk-8-jre-headless | nginx | apache2,
25
- jitsi-meet-web
24
+Depends: openssl, openjdk-8-jre-headless | nginx | apache2
26 25
 Description: Configuration for web serving of Jitsi Meet
27 26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
28 27
  Videobridge to provide high quality, scalable video conferences.
@@ -37,7 +36,7 @@ Description: Configuration for web serving of Jitsi Meet
37 36
 
38 37
 Package: jitsi-meet-prosody
39 38
 Architecture: all
40
-Depends: openssl, prosody | prosody-trunk, jitsi-meet-web
39
+Depends: openssl, prosody | prosody-trunk
41 40
 Description: Prosody configuration for Jitsi Meet
42 41
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
43 42
  Videobridge to provide high quality, scalable video conferences.

+ 4
- 0
debian/jitsi-meet-web-config.docs View File

@@ -0,0 +1,4 @@
1
+doc/debian/jitsi-meet/jitsi-meet.example
2
+doc/debian/jitsi-meet/jitsi-meet.example-apache
3
+doc/debian/jitsi-meet/README
4
+config.js

+ 3
- 3
debian/jitsi-meet-web-config.postinst View File

@@ -94,7 +94,7 @@ case "$1" in
94 94
         # jitsi meet
95 95
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
96 96
         if [ ! -f $JITSI_MEET_CONFIG ] ; then
97
-            cp /usr/share/doc/jitsi-meet-web/config.js $JITSI_MEET_CONFIG
97
+            cp /usr/share/doc/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
98 98
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
99 99
         fi
100 100
 
@@ -171,7 +171,7 @@ case "$1" in
171 171
 
172 172
             # nginx conf
173 173
             if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then
174
-                cp /usr/share/doc/jitsi-meet-web/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
174
+                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
175 175
                 if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then
176 176
                     ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
177 177
                 fi
@@ -202,7 +202,7 @@ case "$1" in
202 202
             if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then
203 203
                 # when creating new config, make sure all needed modules are enabled
204 204
                 a2enmod rewrite ssl headers proxy_http include
205
-                cp /usr/share/doc/jitsi-meet-web/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
205
+                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
206 206
                 a2ensite $JVB_HOSTNAME.conf
207 207
                 sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf
208 208
             fi

+ 0
- 4
debian/jitsi-meet-web.docs View File

@@ -1,5 +1 @@
1 1
 README.md
2
-doc/debian/jitsi-meet/jitsi-meet.example
3
-doc/debian/jitsi-meet/jitsi-meet.example-apache
4
-doc/debian/jitsi-meet/README
5
-config.js

Loading…
Cancel
Save