From 0680df56fdbc10b7a0688f8a050fce29a1045c43 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 5 Sep 2014 15:22:21 +0300 Subject: [PATCH] Changes default prosody config to be plain file, changes dependencies. --- debian/control | 4 +- debian/jitsi-meet-prosody.docs | 2 +- debian/jitsi-meet-prosody.postinst | 4 +- debian/source/include-binaries | 3 +- debian/source/lintian-overrides | 2 - .../prosody.cfg.lua-jvb.example | 210 ++++++++++++++++++ .../prosody.cfg.lua-jvb.example.gz | Bin 3333 -> 0 bytes 7 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example delete mode 100644 debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz diff --git a/debian/control b/debian/control index 78630d889..c59305b5a 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Description: WebRTC JavaScript video conferences Package: jitsi-meet-prosody Architecture: all -Pre-Depends: adduser, openssl, prosody-trunk, jitsi-videobridge -Depends: ${misc:Depends}, nginx, prosody-modules-otalk, lua-sec +Pre-Depends: adduser, openssl, prosody | prosody-trunk, jitsi-videobridge +Depends: ${misc:Depends}, nginx, prosody-module-turncredentials | prosody-modules-otalk, lua-sec 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-prosody.docs b/debian/jitsi-meet-prosody.docs index f640d7fa4..768e61247 100644 --- a/debian/jitsi-meet-prosody.docs +++ b/debian/jitsi-meet-prosody.docs @@ -1 +1 @@ -debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz +debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example diff --git a/debian/jitsi-meet-prosody.postinst b/debian/jitsi-meet-prosody.postinst index 43203b880..2da742bd5 100644 --- a/debian/jitsi-meet-prosody.postinst +++ b/debian/jitsi-meet-prosody.postinst @@ -27,7 +27,7 @@ case "$1" in # if there is no prosody config extract our template if [ ! -f /etc/prosody/prosody.cfg.lua ]; then PROSODY_CONFIG_PRESENT="false" - gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua + cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example /etc/prosody/prosody.cfg.lua fi # if there is no config for our domain, lets create it @@ -37,7 +37,7 @@ case "$1" in if ! grep -q "VirtualHost \"jitmeet.example.com\"" /etc/prosody/prosody.cfg.lua; then PROSODY_CONFIG_PRESENT="false" cp /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig - gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua + cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example /etc/prosody/prosody.cfg.lua fi if [ "PROSODY_CONFIG_PRESENT" = "true" ]; then diff --git a/debian/source/include-binaries b/debian/source/include-binaries index ee3f013b5..2fc92d31d 100644 --- a/debian/source/include-binaries +++ b/debian/source/include-binaries @@ -15,5 +15,4 @@ 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 -debian/usr/share/doc/jitsi-meet-prosody/changelog.Debian.gz -debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz +debian/usr/share/doc/jitsi-meet-prosody/changelog.Debian.gz \ No newline at end of file diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 511158710..d750b020f 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,5 +1,3 @@ -# contains smileys gif files, represented as strings in base64 encoding -source-is-missing smileys.js # The strophe.min.js file, from http://strophe.im/strophejs/ (https://github.com/strophe/strophejs) # contains the source with minimum space characters source-is-missing libs/strophe/strophe.jingle.bundle.js diff --git a/debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example b/debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example new file mode 100644 index 000000000..ce3fb9425 --- /dev/null +++ b/debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example @@ -0,0 +1,210 @@ +-- Prosody XMPP Server Configuration +-- +-- Information on configuring Prosody can be found on our +-- website at http://prosody.im/doc/configure +-- +-- Tip: You can check that the syntax of this file is correct +-- when you have finished by running: prosodyctl check config +-- If there are any errors, it will let you know what and where +-- they are, otherwise it will keep quiet. +-- +-- Good luck, and happy Jabbering! + + +---------- Server-wide settings ---------- +-- Settings in this section apply to the whole server and are the default settings +-- for any virtual hosts + +-- This is a (by default, empty) list of accounts that are admins +-- for the server. Note that you must create the accounts separately +-- (see http://prosody.im/doc/creating_accounts for info) +-- Example: admins = { "user1@example.com", "user2@example.net" } +admins = { } +daemonize = true +cross_domain_bosh = true; +component_ports = { 5347 } + + +-- Enable use of libevent for better performance under high load +-- For more information see: http://prosody.im/doc/libevent +--use_libevent = true + +-- This is the list of modules Prosody will load on startup. +-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. +-- Documentation on modules can be found at: http://prosody.im/doc/modules +modules_enabled = { + + -- Generally required + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + "tls"; -- Add support for secure TLS on c2s/s2s connections + "dialback"; -- s2s dialback support + "disco"; -- Service discovery + "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + + -- Not essential, but recommended + "private"; -- Private XML storage (for room bookmarks, etc.) + "vcard"; -- Allow users to set vCards + + -- These are commented by default as they have a performance impact + --"privacy"; -- Support privacy lists + "compression"; -- Stream compression (requires the lua-zlib package installed) + + -- Nice to have + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + "pep"; -- Enables users to publish their mood, activity, playing music and more + "register"; -- Allow users to register on this server using a client and change passwords + + -- Admin interfaces + "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands + --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 + + -- HTTP modules + "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"http_files"; -- Serve static files from a directory over HTTP + + -- Other specific functionality + --"groups"; -- Shared roster support + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts + --"watchregistrations"; -- Alert admins of registrations + --"motd"; -- Send a message to users when they log in + --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. + -- jitmeet + "smacks"; + "carbons"; + "mam"; + "lastactivity"; + "offline"; + "pubsub"; + "adhoc"; + "websocket"; + "http_altconnect"; + "turncredentials"; +} + +-- These modules are auto-loaded, but should you want +-- to disable them then uncomment them here: +modules_disabled = { + -- "offline"; -- Store offline messages + -- "c2s"; -- Handle client connections + -- "s2s"; -- Handle server-to-server connections +} + +-- Disable account creation by default, for security +-- For more information see http://prosody.im/doc/creating_accounts +allow_registration = false + +-- These are the SSL/TLS-related settings. If you don't want +-- to use SSL/TLS, you may comment or remove this +ssl = { + key = "/etc/prosody/certs/localhost.key"; + certificate = "/etc/prosody/certs/localhost.crt"; +} + +-- Force clients to use encrypted connections? This option will +-- prevent clients from authenticating unless they are using encryption. + +-- c2s_require_encryption = true + +-- Force certificate authentication for server-to-server connections? +-- This provides ideal security, but requires servers you communicate +-- with to support encryption AND present valid, trusted certificates. +-- NOTE: Your version of LuaSec must support certificate verification! +-- For more information see http://prosody.im/doc/s2s#security + +-- s2s_secure_auth = false + +-- Many servers don't support encryption or have invalid or self-signed +-- certificates. You can list domains here that will not be required to +-- authenticate using certificates. They will be authenticated using DNS. + +--s2s_insecure_domains = { "gmail.com" } + +-- Even if you leave s2s_secure_auth disabled, you can still require valid +-- certificates for some domains by specifying a list here. + +--s2s_secure_domains = { "jabber.org" } + +-- Required for init scripts and prosodyctl +pidfile = "/var/run/prosody/prosody.pid" + +-- Select the authentication backend to use. The 'internal' providers +-- use Prosody's configured data storage to store the authentication data. +-- To allow Prosody to offer secure authentication mechanisms to clients, the +-- default provider stores passwords in plaintext. If you do not trust your +-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed +-- for information about using the hashed backend. + +-- authentication = "internal_plain" +authentication = "internal_hashed" + +-- Select the storage backend to use. By default Prosody uses flat files +-- in its configured data directory, but it also supports more backends +-- through modules. An "sql" backend is included by default, but requires +-- additional dependencies. See http://prosody.im/doc/storage for more info. + +--storage = "sql" -- Default is "internal" + +-- For the "sql" backend, you can uncomment *one* of the below to configure: +--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename. +--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } +--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } + +storage = {archive2 = "sql2"} +sql = { driver = "SQLite3", database = "prosody.sqlite" } +default_archive_policy = "roster" + +-- Logging configuration +-- For advanced logging see http://prosody.im/doc/logging +log = { + info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging + error = "/var/log/prosody/prosody.err"; + "*syslog"; +} + +----------- Virtual hosts ----------- +-- You need to add a VirtualHost entry for each domain you wish Prosody to serve. +-- Settings under each VirtualHost entry apply *only* to that host. + +-- VirtualHost "localhost" + +VirtualHost "jitmeet.example.com" + -- enabled = false -- Remove this line to enable this host + authentication = "anonymous" + -- Assign this host a certificate for TLS, otherwise it would use the one + -- set in the global section (if any). + -- Note that old-style SSL on port 5223 only supports one certificate, and will always + -- use the global one. + ssl = { + key = "/etc/prosody/certs/jitmeet.example.com.key"; + certificate = "/etc/prosody/certs/jitmeet.example.com.crt"; + } + +------ Components ------ +-- You can specify components to add hosts that provide special services, +-- like multi-user conferences, and transports. +-- For more information on components, see http://prosody.im/doc/components + +---Set up a MUC (multi-user chat) room server on conference.example.com: +--Component "conference.example.com" "muc" + +-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: +--Component "proxy.example.com" "proxy65" + +---Set up an external component (default component port is 5347) +-- +-- External components allow adding various services, such as gateways/ +-- transports to other networks like ICQ, MSN and Yahoo. For more info +-- see: http://prosody.im/doc/components#adding_an_external_component +-- +--Component "gateway.example.com" +-- component_secret = "password" + +Component "conference.jitmeet.example.com" "muc" + +Component "jitsi-videobridge.jitmeet.example.com" + component_secret = "jitmeetSecret" diff --git a/debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz b/debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz deleted file mode 100644 index 5ccfeebc745faa62326f37ebd9845535bd2df877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3333 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 PR5AM>V3m`7_#yxRM&yPy