Преглед изворни кода

Removes jetty and makes nginx default webserver.

master
damencho пре 5 година
родитељ
комит
f904626f5e

+ 1
- 1
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 | nginx-extras | apache2
24
+Depends: openssl, nginx | nginx-extras | apache2
25
 Description: Configuration for web serving of Jitsi Meet
25
 Description: Configuration for web serving of Jitsi Meet
26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
27
  Videobridge to provide high quality, scalable video conferences.
27
  Videobridge to provide high quality, scalable video conferences.

+ 14
- 65
debian/jitsi-meet-web-config.postinst Прегледај датотеку

43
         fi
43
         fi
44
 
44
 
45
         JVB_SERVE="false"
45
         JVB_SERVE="false"
46
-        db_get jitsi-meet/jvb-serve
46
+        # this detect only old installations
47
+        db_get jitsi-meet/jvb-serve || true
47
         if [ -n "$RET" ] && [ "$RET" = "true" ] ; then
48
         if [ -n "$RET" ] && [ "$RET" = "true" ] ; then
48
             JVB_SERVE="true"
49
             JVB_SERVE="true"
49
         fi
50
         fi
51
+        echo "------> $JVB_SERVE"
50
 
52
 
51
         # stores the hostname so we will reuse it later, like in purge
53
         # stores the hostname so we will reuse it later, like in purge
52
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
54
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
106
 
108
 
107
         # this is new install let's configure jvb to serve meet
109
         # this is new install let's configure jvb to serve meet
108
         # no-nginx, no-apache installed on machine, this is new install or reconfiguring old one which have jvb_serve set
110
         # no-nginx, no-apache installed on machine, this is new install or reconfiguring old one which have jvb_serve set
109
-        if [[ -z "$FORCE_NGINX" && -z "$FORCE_APACHE" && ( -z "$JVB_HOSTNAME_OLD" || ( "$JVB_SERVE" = "true" && "$RECONFIGURING" = "true" )) ]] ; then
110
-
111
-            JVB_ETC_CONFIG="/etc/jitsi/videobridge/config"
112
-            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
113
-
114
-            # this is a reconfigure, lets just delete old links
115
-            if [ "$RECONFIGURING" = "true" ] ; then
116
-                rm -f $JVB_CONFIG
117
-            fi
118
-
119
-            # we will write to the file if missing create it
120
-            if [ ! -f $JVB_CONFIG ] ; then
121
-                touch $JVB_CONFIG
122
-            fi
123
-
124
-            # configure jvb
125
-            echo "AUTHBIND=yes" >> $JVB_ETC_CONFIG
126
-            sed -i "s/JVB_OPTS=.*/JVB_OPTS=--apis=rest,xmpp/g" $JVB_ETC_CONFIG
127
-
128
-            echo "org.jitsi.videobridge.rest.jetty.host=::" >> $JVB_CONFIG
129
-            echo "org.jitsi.videobridge.rest.jetty.port=443" >> $JVB_CONFIG
130
-            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.hostHeader=$JVB_HOSTNAME" >> $JVB_CONFIG
131
-            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.pathSpec=/http-bind" >> $JVB_CONFIG
132
-            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.proxyTo=http://localhost:5280/http-bind" >> $JVB_CONFIG
133
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.resourceBase=/usr/share/jitsi-meet" >> $JVB_CONFIG
134
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./config.js=/etc/jitsi/meet/$JVB_HOSTNAME-config.js" >> $JVB_CONFIG
135
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./interface_config.js=/usr/share/jitsi-meet/interface_config.js" >> $JVB_CONFIG
136
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./logging_config.js=/usr/share/jitsi-meet/logging_config.js" >> $JVB_CONFIG
137
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./external_api.js=/usr/share/jitsi-meet/libs/external_api.min.js" >> $JVB_CONFIG
138
-            echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.regex=^/([a-zA-Z0-9]+)$" >> $JVB_CONFIG
139
-            echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.replacement=/" >> $JVB_CONFIG
140
-            echo "org.jitsi.videobridge.rest.jetty.SSIResourceHandler.paths=/" >> $JVB_CONFIG
141
-            echo "org.jitsi.videobridge.rest.jetty.tls.port=443" >> $JVB_CONFIG
142
-            echo "org.jitsi.videobridge.TCP_HARVESTER_PORT=443" >> $JVB_CONFIG
143
-            echo "org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePath=/etc/jitsi/videobridge/$JVB_HOSTNAME.jks" >> $JVB_CONFIG
144
-            echo "org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePassword=changeit" >> $JVB_CONFIG
145
-
146
-            # configure authbind to allow jvb to bind to privileged ports
147
-            OWNER=$(stat -c '%U' /usr/share/jitsi-videobridge)
148
-            GROUP=$(stat -c '%G' /usr/share/jitsi-videobridge)
149
-            JVB_UID="`id -u $OWNER`"
150
-            if [ ! -f "/etc/authbind/byport/443" ] ; then
151
-                if [ ! -d "/etc/authbind/byport" ] ; then
152
-                        mkdir -p /etc/authbind/byport
153
-                        chmod 755 /etc/authbind
154
-                        chmod 755 /etc/authbind/byport
155
-                fi
156
-                touch /etc/authbind/byport/443
157
-                chown $OWNER /etc/authbind/byport/443
158
-                chmod 755 /etc/authbind/byport/443
159
-            fi
160
-
161
-            CERT_P12="/etc/jitsi/videobridge/$JVB_HOSTNAME.p12"
162
-            CERT_JKS="/etc/jitsi/videobridge/$JVB_HOSTNAME.jks"
163
-            # create jks from  certs
164
-            openssl pkcs12 -export \
165
-                -in $CERT_CRT -inkey $CERT_KEY -passout pass:changeit > $CERT_P12
166
-            keytool -importkeystore -destkeystore $CERT_JKS \
167
-                -srckeystore $CERT_P12 -srcstoretype pkcs12 \
168
-                -noprompt -storepass changeit -srcstorepass changeit
169
-
170
-            db_set jitsi-meet/jvb-serve "true"
171
-
172
-            invoke-rc.d jitsi-videobridge restart || true
111
+        if [[ "$JVB_SERVE" = "true" ]] ; then
112
+            echo ""
113
+            echo "------------------------------------------------"
114
+            echo "You are using jetty to serve jitsi-meet, it is recommended to uninstall(purge) and use default installation that comes with nginx!"
115
+            echo ""
116
+            echo "When using the following command any custom config will be LOST!!!"
117
+            echo ""
118
+            echo "You can purge your installation using the following command:"
119
+            echo "apt-get purge jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-web jicofo jitsi-videobridge"
120
+            echo "------------------------------------------------"
121
+            echo ""
173
         elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
122
         elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
174
             # this is a reconfigure, lets just delete old links
123
             # this is a reconfigure, lets just delete old links
175
             if [ "$RECONFIGURING" = "true" ] ; then
124
             if [ "$RECONFIGURING" = "true" ] ; then

+ 0
- 2
debian/jitsi-meet-web-config.postrm Прегледај датотеку

40
             rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
40
             rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
41
             rm -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf
41
             rm -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf
42
             rm -f /etc/apache2/sites-enabled/$JVB_HOSTNAME.conf
42
             rm -f /etc/apache2/sites-enabled/$JVB_HOSTNAME.conf
43
-            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.jks
44
-            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.p12
45
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.key
43
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.key
46
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.crt
44
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.crt
47
         fi
45
         fi

+ 0
- 6
debian/jitsi-meet-web-config.templates Прегледај датотеку

26
 _Description: The hostname of the current installation:
26
 _Description: The hostname of the current installation:
27
  The value for the hostname that is set in Jitsi Videobridge installation.
27
  The value for the hostname that is set in Jitsi Videobridge installation.
28
 
28
 
29
-Template: jitsi-meet/jvb-serve
30
-Type: boolean
31
-Default: false
32
-_Description: for internal use
33
- for internal use.
34
-
35
 Template: jitsi-videobridge/jvb-hostname
29
 Template: jitsi-videobridge/jvb-hostname
36
 Type: string
30
 Type: string
37
 _Description: Hostname:
31
 _Description: Hostname:

Loading…
Откажи
Сачувај