From d663ee40bbbab6c5293793d773aa2c667af98ca5 Mon Sep 17 00:00:00 2001 From: turint Date: Thu, 5 Jun 2014 13:22:44 +0300 Subject: [PATCH 01/10] Added favicon.ico for 1) better jitsi brand recognition and 2) getting rid of warnings in web server log files --- favicon.ico | Bin 0 -> 3638 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 favicon.ico diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..bb34caf1ffdb68de313a75db9e9f8ff87ece3ec4 GIT binary patch literal 3638 zcmeH}cTiMU6vn^hxw^_K3kXPW3Id{{f;4HatDr1`h@g}Q#NGu~4c1r^8buG*{qAyEe1&2W{mWmX2{q( ziO3pR2keOKkrm^JoP&H46URedJP*0?(~)<`gJ>r5 zzLUrk`G;pC|A-IK92EQ@kuM64N;DUR34SO@n1{k2{ZVvmK8lV9q2y!;5si{lp(s8T zj?&YiC^;RD;?oOJdL|r&XO^KXaS=)rm!SOYQk0%uPP780=T@SOsN%vZlwXWMg;Y_f z_&Jg&3YC`ysJI-BswiTvFuYUp2jcr8RQFU`CM0aCQeJ=(NllGw|DHgRU@ugUpKo5`L)&|zHne~EfcAEY+Iu{g{$zg#{)-OKG(C4VxpWz$oVx@x?Wd#~5**T* znl(w&jKvxs@K0vCk)^ec{=~ujKv~9PjJX{lkG<|#Sv-Hp3@vwk1x-V3Z&|`u!E zynv<8Q=a!Rq-pPAj^jML#B|`G33Ix}w8aSN^Zwf&OE_ylNdu{yG?BbX7b#l|k-F7T%HOo@CP>?1hSVKnaDS&c(sx-RZMPLN z_Dmp5wn6${J7ny$Mdp5cWX4QEHeqt+K^c#;VqKB*4Ph~1aPGJ6$d$5}kGu~4O1PV! z5P*_nekeR1jN%i)C^|tC#?pkbVT7#6<*x}(Y0uz%@AJOhO%qBq+Au=*agu|!q;10LU?O0s&DUx@b-Q@xU&bf zcfZ1ey9ZEn?*JYo#i2Smp0GAf%G=81BdAL|gu3*@s3qL3`Slp;GmfGz^CaqXenNfj zc|6KLkA{MacvN@^jYU_{RD1<>MYqvdd;^b5iOPRLbHyDr36t?yn2KgmI+{co5Z7iy zT$hjM^@R}Em*ROt30j&e3A06b)m)2L;(ELkKf>$h4QPGw7;jphqP682-nO<7hPU9| zAFX)**ITr;z3b<9Z!dg*UakWI*;wt+@uQb%qE0V{EWM0kM)Xx+4utpNFU2r;^x<>i zPZ<+GDyruqL*@!&>N5{R4#$AEvWJqPniKsQ0CR)}6O=<_w+iMcBO@=iyN|Qm9A9nd zciYN96GON!Qj#=I(Z?Dr>vi%=unerQz=A(S+F6g0YS36MSD?oVWcVxk29aj~sKvHU zknE;&@WJD*3DOuR`CtYntBXo?-UFlZ7REH^IOm#Np)7p&AJ_j$2F z={V2eYv}|oH)X7nD-bLj%5hd_f??!DQ9Rq3d<8#we=TLEry3gOsK>VAYcQO=7}Ml? zy#^NAfR_DqYgJ&d-7Jikzdwqt!j(R~WRK%iys0trzQ7sQd<_bd{j~sBh1m>?Py7fy zsBrzlEtxKsgIp+IO#8$aM7j-zf-C7?_`E<*ea7NXeSsiy0s_<-JgX3MC0KX21p-gT zR8uEeB)60UmP3#aQ@ Date: Tue, 1 Jul 2014 16:18:30 +0300 Subject: [PATCH 02/10] debian folder initial version --- debian/README.Debian | 8 ++ debian/README.source | 6 ++ debian/changelog | 6 ++ debian/compat | 1 + debian/conffiles | 2 + debian/control | 18 +++++ debian/copyright | 31 ++++++++ debian/docs | 1 + debian/install | 2 + debian/postinst | 70 ++++++++++++++++++ debian/postrm | 50 +++++++++++++ debian/preinst | 35 +++++++++ debian/prerm | 36 +++++++++ debian/rules | 13 ++++ debian/source/format | 1 + debian/source/include-binaries | 17 +++++ debian/usr/share/doc/jitsi-meet/README | 13 ++++ .../share/doc/jitsi-meet/changelog.Debian.gz | Bin 0 -> 169 bytes debian/usr/share/doc/jitsi-meet/copyright | 31 ++++++++ .../share/doc/jitsi-meet/jitsi-meet.example | 36 +++++++++ 20 files changed, 377 insertions(+) create mode 100644 debian/README.Debian create mode 100644 debian/README.source create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/conffiles create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/install create mode 100644 debian/postinst create mode 100644 debian/postrm create mode 100644 debian/preinst create mode 100644 debian/prerm create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/include-binaries create mode 100644 debian/usr/share/doc/jitsi-meet/README create mode 100644 debian/usr/share/doc/jitsi-meet/changelog.Debian.gz create mode 100644 debian/usr/share/doc/jitsi-meet/copyright create mode 100644 debian/usr/share/doc/jitsi-meet/jitsi-meet.example diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000000000..e79c133d2 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,8 @@ +Jitsi Meet for Debian +---------------------------- + +This is a WebRTC frontend of the video conferencing tool Jitsi Meet. It depends on the +jitsi-videobridge package, which is a SFU (Selective Forwarding Unit) and both packages +are designed to work together. + + -- Yasen Pramatarov Mon, 30 Jun 2014 23:05:18 +0100 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000000000..45d7a1eb7 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,6 @@ +jitsi-meet for Debian +--------------------- + +The jitsi-meet package is built from the sources of Jitsi Meet. + +Jitsi Meet is downloaded from https://github.com/jitsi/jitsi-meet and the git files are removed. you can recreate the source with 'git clone https://github.com/jitsi/jitsi-meet.git'. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..256b1fe7e --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +jitsi-meet (1.0.1-1) unstable; urgency=low + + * Initial release + * Jitsi Meet github snapshot from 2014-07-01 + + -- Yasen Pramatarov Tue, 01 Jul 2014 16:31:41 +0300 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..45a4fb75d --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/conffiles b/debian/conffiles new file mode 100644 index 000000000..61db7897c --- /dev/null +++ b/debian/conffiles @@ -0,0 +1,2 @@ +/etc/apt/sources.list.d/prosody-trunk.list +/etc/apt/sources.list.d/jitsi.list diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..13828633c --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: jitsi-meet +Section: net +Priority: extra +Maintainer: Yasen Pramatarov +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.3 +Homepage: https://jitsi.org/Projects/JitsiMeet + +Package: jitsi-meet +Architecture: any +Pre-Depends: adduser, openssl, jitsi-videobridge +Depends: ${shlibs:Depends}, ${misc:Depends}, nginx +Description: WebRTC JavaScript video conferences + Jitsi Meet is a WebRTC JavaScript application that uses Jitsi + Videobridge to provide high quality, scalable video conferences. + . + It is a web interface to Jitsi Videobridge for audio and video + forwarding and relaying, configured to work with nginx diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..06376c2a9 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: Jitsi Meet +Upstream-Contact: Emil Ivov +Source: https://github.com/jitsi/jitsi-meet + +Files: * +Copyright: 2013-2014 Jitsi +License: MIT + +License: MIT + The MIT License (MIT) + . + Copyright (c) 2013 ESTOS GmbH + Copyright (c) 2013 BlueJimp SARL + . + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/docs b/debian/docs new file mode 100644 index 000000000..b43bf86b5 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/install b/debian/install new file mode 100644 index 000000000..f57f50fdd --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +debian/etc/* /etc/ +debian/usr/share/* /usr/share/ diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 000000000..978118b9a --- /dev/null +++ b/debian/postinst @@ -0,0 +1,70 @@ +#!/bin/sh +# postinst script for jitsi-meet +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + + # firewall conf + ufw allow 80 + + # nginx conf + . /etc/default/jitsi-videobridge + cp /usr/share/doc/jitsi-meet/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 + sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf + # FIXME do we need the default? + if [ ! -f /etc/nginx/sites-enabled/default ]; then + ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default + fi + if grep "# server_names_hash_bucket_size 64" /etc/nginx/nginx.conf > /dev/null; then + sed -i "s/#\ server_names_hash_bucket_size\ 64/\ server_names_hash_bucket_size\ 64/" /etc/nginx/nginx.conf + fi + + # jitsi meet + chown -R www-data:www-data /srv/web/jitsi-meet/ + sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /srv/web/jitsi-meet/config.js + # enable turn + if grep "// useStunTurn: true," /srv/web/jitsi-meet/config.js > /dev/null; then + sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /srv/web/jitsi-meet/config.js + fi + invoke-rc.d nginx restart + + # and we're done + db_stop + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 000000000..5929810c7 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,50 @@ +#!/bin/sh +# postrm script for jitsi-meet +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Load debconf +. /usr/share/debconf/confmodule + + +case "$1" in + purge|remove) + rm /etc/nginx/sites-enabled/jitsi-meet + rm /etc/nginx/sites-available/jitsi-meet + if [ -x "/etc/init.d/nginx" ]; then + invoke-rc.d nginx reload + fi + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +db_stop + +exit 0 diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 000000000..794394d6d --- /dev/null +++ b/debian/preinst @@ -0,0 +1,35 @@ +#!/bin/sh +# preinst script for jitsi-meet +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 000000000..10f8454d5 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,36 @@ +#!/bin/sh +# prerm script for jitsi-meet +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|purge) + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..b760bee7f --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 000000000..1acd4d013 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,17 @@ +debian/usr/share/jitsi-meet/favicon.ico +debian/usr/share/jitsi-meet/fonts/jitsi.eot +debian/usr/share/jitsi-meet/fonts/jitsi.woff +debian/usr/share/jitsi-meet/fonts/jitsi.ttf +debian/usr/share/jitsi-meet/sounds/left.wav +debian/usr/share/jitsi-meet/sounds/incomingMessage.wav +debian/usr/share/jitsi-meet/sounds/joined.wav +debian/usr/share/jitsi-meet/images/estoslogo.png +debian/usr/share/jitsi-meet/images/chromelogo.png +debian/usr/share/jitsi-meet/images/jitsilogo.png +debian/usr/share/jitsi-meet/images/watermark.png +debian/usr/share/jitsi-meet/images/avatarprezi.png +debian/usr/share/jitsi-meet/images/chromepointer.png +debian/usr/share/jitsi-meet/images/avatar1.png +debian/usr/share/jitsi-meet/images/popupPointer.png +debian/usr/share/jitsi-meet/images/favicon.ico +debian/usr/share/doc/jitsi-meet/changelog.Debian.gz diff --git a/debian/usr/share/doc/jitsi-meet/README b/debian/usr/share/doc/jitsi-meet/README new file mode 100644 index 000000000..a198dcae3 --- /dev/null +++ b/debian/usr/share/doc/jitsi-meet/README @@ -0,0 +1,13 @@ +Jitsi Meet + +==== + +A WebRTC-powered multi-user videochat. For a live demo, check out either +https://meet.estos.de/ or https://meet.jit.si/. + +Built using colibri.js[0] and strophe.jingle[1], powered by the jitsi-videobridge[2] + + +[0] https://github.com/ESTOS/colibri.js +[1] https://github.com/ESTOS/strophe.jingle +[3] https://github.com/jitsi/jitsi-videobridge diff --git a/debian/usr/share/doc/jitsi-meet/changelog.Debian.gz b/debian/usr/share/doc/jitsi-meet/changelog.Debian.gz new file mode 100644 index 0000000000000000000000000000000000000000..91191c76627c86ddfbfcd05cce382b795af2e247 GIT binary patch literal 169 zcmV;a09OAWiwFqBkg`(%17m1mZf9j|Z)Yw6ND65hR{)5vv%e6I`2W{VF=j{b}c(*}KxMzoX Xh^lUA*T@6bB#DYY2wK*FmH+?%d8$ft literal 0 HcmV?d00001 diff --git a/debian/usr/share/doc/jitsi-meet/copyright b/debian/usr/share/doc/jitsi-meet/copyright new file mode 100644 index 000000000..06376c2a9 --- /dev/null +++ b/debian/usr/share/doc/jitsi-meet/copyright @@ -0,0 +1,31 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: Jitsi Meet +Upstream-Contact: Emil Ivov +Source: https://github.com/jitsi/jitsi-meet + +Files: * +Copyright: 2013-2014 Jitsi +License: MIT + +License: MIT + The MIT License (MIT) + . + Copyright (c) 2013 ESTOS GmbH + Copyright (c) 2013 BlueJimp SARL + . + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/usr/share/doc/jitsi-meet/jitsi-meet.example b/debian/usr/share/doc/jitsi-meet/jitsi-meet.example new file mode 100644 index 000000000..b2773ad8a --- /dev/null +++ b/debian/usr/share/doc/jitsi-meet/jitsi-meet.example @@ -0,0 +1,36 @@ +server { + listen 80; + server_name jitsi-meet.example.com; + return 301 https://$host$request_uri; +} +server { + listen 443 ssl; + server_name jitsi-meet.example.com; + + ssl_certificate /var/lib/prosody/jitsi-meet.example.com.crt; + ssl_certificate_key /var/lib/prosody/jitsi-meet.example.com.key; + + root /srv/web/jitsi-meet; + index index.html index.htm; + + location ~ ^/([a-zA-Z0-9]+)$ { + rewrite ^/(.*)$ / break; + } + + # BOSH + location /http-bind { + proxy_pass http://localhost:5280/http-bind; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $http_host; + } + + # xmpp websockets + location /xmpp-websocket { + proxy_pass http://localhost:5280; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + tcp_nodelay on; + } +} From 186c1ff4844937aa989173fc05db25ad9f1cf8cd Mon Sep 17 00:00:00 2001 From: turint Date: Tue, 1 Jul 2014 16:21:07 +0300 Subject: [PATCH 03/10] removed apt sources files, they will be in separate package --- debian/install | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/install b/debian/install index f57f50fdd..b7e674a4a 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1 @@ -debian/etc/* /etc/ debian/usr/share/* /usr/share/ From 450e2a05ff77da3aed42966bba3b2db6c84a2ca4 Mon Sep 17 00:00:00 2001 From: turint Date: Tue, 1 Jul 2014 16:22:52 +0300 Subject: [PATCH 04/10] removed apt sources files --- debian/conffiles | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/conffiles diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 61db7897c..000000000 --- a/debian/conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/apt/sources.list.d/prosody-trunk.list -/etc/apt/sources.list.d/jitsi.list From ddaf6caa51e3e086781ba3a46dacc728410e19ad Mon Sep 17 00:00:00 2001 From: turint Date: Tue, 1 Jul 2014 16:25:30 +0300 Subject: [PATCH 05/10] /srv/web/ references changed to /usr/share/ ones --- debian/postinst | 8 ++++---- debian/usr/share/doc/jitsi-meet/jitsi-meet.example | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/postinst b/debian/postinst index 978118b9a..b391e20d1 100644 --- a/debian/postinst +++ b/debian/postinst @@ -40,11 +40,11 @@ case "$1" in fi # jitsi meet - chown -R www-data:www-data /srv/web/jitsi-meet/ - sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /srv/web/jitsi-meet/config.js + chown -R www-data:www-data /usr/share/jitsi-meet/ + sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /usr/share/jitsi-meet/config.js # enable turn - if grep "// useStunTurn: true," /srv/web/jitsi-meet/config.js > /dev/null; then - sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /srv/web/jitsi-meet/config.js + if grep "// useStunTurn: true," /usr/share/jitsi-meet/config.js > /dev/null; then + sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /usr/share/jitsi-meet/config.js fi invoke-rc.d nginx restart diff --git a/debian/usr/share/doc/jitsi-meet/jitsi-meet.example b/debian/usr/share/doc/jitsi-meet/jitsi-meet.example index b2773ad8a..dbba423aa 100644 --- a/debian/usr/share/doc/jitsi-meet/jitsi-meet.example +++ b/debian/usr/share/doc/jitsi-meet/jitsi-meet.example @@ -10,7 +10,7 @@ server { ssl_certificate /var/lib/prosody/jitsi-meet.example.com.crt; ssl_certificate_key /var/lib/prosody/jitsi-meet.example.com.key; - root /srv/web/jitsi-meet; + root /usr/share/jitsi-meet; index index.html index.htm; location ~ ^/([a-zA-Z0-9]+)$ { From 90afe1b4dc2bd3369907842bba73fc388b7638b2 Mon Sep 17 00:00:00 2001 From: turint Date: Tue, 1 Jul 2014 16:43:16 +0300 Subject: [PATCH 06/10] added uploaders and fixed homepage address --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 13828633c..4d25e24b1 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,11 @@ Source: jitsi-meet Section: net Priority: extra -Maintainer: Yasen Pramatarov +Maintainer: Jitsi Team +Uploaders: Emil Ivov , Damian Minkov Build-Depends: debhelper (>= 8.0.0) Standards-Version: 3.9.3 -Homepage: https://jitsi.org/Projects/JitsiMeet +Homepage: https://jitsi.org/meet Package: jitsi-meet Architecture: any From b24898c79ded520313bcc5fb76d683f1da7eb863 Mon Sep 17 00:00:00 2001 From: turint Date: Fri, 4 Jul 2014 21:27:43 +0300 Subject: [PATCH 07/10] removed an unneeded and breaking the build debconf reference --- debian/postinst | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/postinst b/debian/postinst index b391e20d1..0bcb762b5 100644 --- a/debian/postinst +++ b/debian/postinst @@ -48,9 +48,6 @@ case "$1" in fi invoke-rc.d nginx restart - # and we're done - db_stop - ;; abort-upgrade|abort-remove|abort-deconfigure) From 0c495b3d2835aae0d091ed636da83d58390c5285 Mon Sep 17 00:00:00 2001 From: turint Date: Fri, 4 Jul 2014 22:25:44 +0300 Subject: [PATCH 08/10] jitsi-meet.example.com domain references in the example config --- config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index 22d93589a..a39af7505 100644 --- a/config.js +++ b/config.js @@ -1,14 +1,14 @@ var config = { hosts: { - domain: 'guest.jit.si', - muc: 'meet.jit.si', // FIXME: use XEP-0030 - bridge: 'jitsi-videobridge.lambada.jitsi.net' // FIXME: use XEP-0030 + domain: 'jitsi-meet.example.com', + muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030 + bridge: 'jitsi-videobridge.jitsi-meet.example.com' // FIXME: use XEP-0030 }, // getroomnode: function (path) { return 'someprefixpossiblybasedonpath'; }, // useStunTurn: true, // use XEP-0215 to fetch STUN and TURN server // useIPv6: true, // ipv6 support. use at your own risk useNicks: false, - bosh: '//lambada.jitsi.net/http-bind', // FIXME: use xep-0156 for that + bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that desktopSharing: 'ext', // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable. chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension minChromeExtVersion: '0.1', // Required version of Chrome extension From 36743da2905cdc8b7210d55f8edd43255b80f493 Mon Sep 17 00:00:00 2001 From: turint Date: Mon, 7 Jul 2014 12:50:29 +0300 Subject: [PATCH 09/10] fix for architecture independent builds (arch "all") --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4d25e24b1..b11ee6ede 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.3 Homepage: https://jitsi.org/meet Package: jitsi-meet -Architecture: any +Architecture: all Pre-Depends: adduser, openssl, jitsi-videobridge Depends: ${shlibs:Depends}, ${misc:Depends}, nginx Description: WebRTC JavaScript video conferences From 3958d8b347bf966100dadefe2bf8f15905c66110 Mon Sep 17 00:00:00 2001 From: turint Date: Mon, 7 Jul 2014 15:30:52 +0300 Subject: [PATCH 10/10] added rule for webroot populating through install & rules --- debian/install | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/install b/debian/install index b7e674a4a..a9db9170c 100644 --- a/debian/install +++ b/debian/install @@ -1 +1,2 @@ +* /usr/share/jitsi-meet/ debian/usr/share/* /usr/share/ diff --git a/debian/rules b/debian/rules index b760bee7f..7bda609c0 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,6 @@ #export DH_VERBOSE=1 %: + dh_install -Xdebian -Xdoc -XINSTALL.md -XLICENSE -XREADME.md usr/share/jitsi-meet/ + dh $@