瀏覽代碼

Simplifies dependencies, removes possible circular dependency.

master
damencho 8 年之前
父節點
當前提交
7d81ec4d86
共有 4 個檔案被更改,包括 9 行新增10 行删除
  1. 2
    3
      debian/control
  2. 4
    0
      debian/jitsi-meet-web-config.docs
  3. 3
    3
      debian/jitsi-meet-web-config.postinst
  4. 0
    4
      debian/jitsi-meet-web.docs

+ 2
- 3
debian/control 查看文件

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

+ 4
- 0
debian/jitsi-meet-web-config.docs 查看文件

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 查看文件

94
         # jitsi meet
94
         # jitsi meet
95
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
95
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
96
         if [ ! -f $JITSI_MEET_CONFIG ] ; then
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
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
98
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
99
         fi
99
         fi
100
 
100
 
171
 
171
 
172
             # nginx conf
172
             # nginx conf
173
             if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then
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
                 if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then
175
                 if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then
176
                     ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
176
                     ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
177
                 fi
177
                 fi
202
             if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then
202
             if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then
203
                 # when creating new config, make sure all needed modules are enabled
203
                 # when creating new config, make sure all needed modules are enabled
204
                 a2enmod rewrite ssl headers proxy_http include
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
                 a2ensite $JVB_HOSTNAME.conf
206
                 a2ensite $JVB_HOSTNAME.conf
207
                 sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf
207
                 sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf
208
             fi
208
             fi

+ 0
- 4
debian/jitsi-meet-web.docs 查看文件

1
 README.md
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…
取消
儲存