Browse Source

Changes default prosody config to be plain file, changes dependencies.

j8
Damian Minkov 11 years ago
parent
commit
0680df56fd

+ 2
- 2
debian/control View File

@@ -20,8 +20,8 @@ Description: WebRTC JavaScript video conferences
20 20
 
21 21
 Package: jitsi-meet-prosody
22 22
 Architecture: all
23
-Pre-Depends: adduser, openssl, prosody-trunk, jitsi-videobridge
24
-Depends: ${misc:Depends}, nginx, prosody-modules-otalk, lua-sec
23
+Pre-Depends: adduser, openssl, prosody | prosody-trunk, jitsi-videobridge
24
+Depends: ${misc:Depends}, nginx, prosody-module-turncredentials | prosody-modules-otalk, lua-sec
25 25
 Description: Prosody configuration for Jitsi Meet
26 26
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
27 27
  Videobridge to provide high quality, scalable video conferences.

+ 1
- 1
debian/jitsi-meet-prosody.docs View File

@@ -1 +1 @@
1
-debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz
1
+debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

+ 2
- 2
debian/jitsi-meet-prosody.postinst View File

@@ -27,7 +27,7 @@ case "$1" in
27 27
         # if there is no prosody config extract our template
28 28
         if [ ! -f /etc/prosody/prosody.cfg.lua ]; then
29 29
             PROSODY_CONFIG_PRESENT="false"
30
-            gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
30
+            cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example /etc/prosody/prosody.cfg.lua
31 31
         fi
32 32
 
33 33
         # if there is no config for our domain, lets create it
@@ -37,7 +37,7 @@ case "$1" in
37 37
             if ! grep -q "VirtualHost \"jitmeet.example.com\"" /etc/prosody/prosody.cfg.lua; then
38 38
                 PROSODY_CONFIG_PRESENT="false"
39 39
                 cp /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig
40
-                gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
40
+                cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example /etc/prosody/prosody.cfg.lua
41 41
             fi
42 42
 
43 43
             if [ "PROSODY_CONFIG_PRESENT" = "true" ]; then

+ 1
- 2
debian/source/include-binaries View File

@@ -15,5 +15,4 @@ debian/usr/share/jitsi-meet/images/avatar1.png
15 15
 debian/usr/share/jitsi-meet/images/popupPointer.png
16 16
 debian/usr/share/jitsi-meet/images/favicon.ico
17 17
 debian/usr/share/doc/jitsi-meet/changelog.Debian.gz
18
-debian/usr/share/doc/jitsi-meet-prosody/changelog.Debian.gz
19
-debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz
18
+debian/usr/share/doc/jitsi-meet-prosody/changelog.Debian.gz

+ 0
- 2
debian/source/lintian-overrides View File

@@ -1,5 +1,3 @@
1
-# contains smileys gif files, represented as strings in base64 encoding
2
-source-is-missing smileys.js
3 1
 # The strophe.min.js file, from http://strophe.im/strophejs/ (https://github.com/strophe/strophejs)
4 2
 # contains the source with minimum space characters
5 3
 source-is-missing libs/strophe/strophe.jingle.bundle.js

+ 210
- 0
debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example View File

@@ -0,0 +1,210 @@
1
+-- Prosody XMPP Server Configuration
2
+--
3
+-- Information on configuring Prosody can be found on our
4
+-- website at http://prosody.im/doc/configure
5
+--
6
+-- Tip: You can check that the syntax of this file is correct
7
+-- when you have finished by running: prosodyctl check config
8
+-- If there are any errors, it will let you know what and where
9
+-- they are, otherwise it will keep quiet.
10
+--
11
+-- Good luck, and happy Jabbering!
12
+
13
+
14
+---------- Server-wide settings ----------
15
+-- Settings in this section apply to the whole server and are the default settings
16
+-- for any virtual hosts
17
+
18
+-- This is a (by default, empty) list of accounts that are admins
19
+-- for the server. Note that you must create the accounts separately
20
+-- (see http://prosody.im/doc/creating_accounts for info)
21
+-- Example: admins = { "user1@example.com", "user2@example.net" }
22
+admins = { }
23
+daemonize = true
24
+cross_domain_bosh = true;
25
+component_ports = { 5347 }
26
+
27
+
28
+-- Enable use of libevent for better performance under high load
29
+-- For more information see: http://prosody.im/doc/libevent
30
+--use_libevent = true
31
+
32
+-- This is the list of modules Prosody will load on startup.
33
+-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
34
+-- Documentation on modules can be found at: http://prosody.im/doc/modules
35
+modules_enabled = {
36
+
37
+        -- Generally required
38
+                "roster"; -- Allow users to have a roster. Recommended ;)
39
+                "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
40
+                "tls"; -- Add support for secure TLS on c2s/s2s connections
41
+                "dialback"; -- s2s dialback support
42
+                "disco"; -- Service discovery
43
+                "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
44
+
45
+        -- Not essential, but recommended
46
+                "private"; -- Private XML storage (for room bookmarks, etc.)
47
+                "vcard"; -- Allow users to set vCards
48
+
49
+        -- These are commented by default as they have a performance impact
50
+                --"privacy"; -- Support privacy lists
51
+                "compression"; -- Stream compression (requires the lua-zlib package installed)
52
+
53
+        -- Nice to have
54
+                "version"; -- Replies to server version requests
55
+                "uptime"; -- Report how long server has been running
56
+                "time"; -- Let others know the time here on this server
57
+                "ping"; -- Replies to XMPP pings with pongs
58
+                "pep"; -- Enables users to publish their mood, activity, playing music and more
59
+                "register"; -- Allow users to register on this server using a client and change passwords
60
+
61
+        -- Admin interfaces
62
+                "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
63
+                --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
64
+
65
+        -- HTTP modules
66
+                "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
67
+                --"http_files"; -- Serve static files from a directory over HTTP
68
+
69
+        -- Other specific functionality
70
+                --"groups"; -- Shared roster support
71
+                --"announce"; -- Send announcement to all online users
72
+                --"welcome"; -- Welcome users who register accounts
73
+                --"watchregistrations"; -- Alert admins of registrations
74
+                --"motd"; -- Send a message to users when they log in
75
+                --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
76
+        -- jitmeet
77
+                "smacks";
78
+                "carbons";
79
+                "mam";
80
+                "lastactivity";
81
+                "offline";
82
+                "pubsub";
83
+                "adhoc";
84
+                "websocket";
85
+                "http_altconnect";
86
+                "turncredentials";
87
+}
88
+
89
+-- These modules are auto-loaded, but should you want
90
+-- to disable them then uncomment them here:
91
+modules_disabled = {
92
+        -- "offline"; -- Store offline messages
93
+        -- "c2s"; -- Handle client connections
94
+        -- "s2s"; -- Handle server-to-server connections
95
+}
96
+
97
+-- Disable account creation by default, for security
98
+-- For more information see http://prosody.im/doc/creating_accounts
99
+allow_registration = false
100
+
101
+-- These are the SSL/TLS-related settings. If you don't want
102
+-- to use SSL/TLS, you may comment or remove this
103
+ssl = {
104
+        key = "/etc/prosody/certs/localhost.key";
105
+        certificate = "/etc/prosody/certs/localhost.crt";
106
+}
107
+
108
+-- Force clients to use encrypted connections? This option will
109
+-- prevent clients from authenticating unless they are using encryption.
110
+
111
+-- c2s_require_encryption = true
112
+
113
+-- Force certificate authentication for server-to-server connections?
114
+-- This provides ideal security, but requires servers you communicate
115
+-- with to support encryption AND present valid, trusted certificates.
116
+-- NOTE: Your version of LuaSec must support certificate verification!
117
+-- For more information see http://prosody.im/doc/s2s#security
118
+
119
+-- s2s_secure_auth = false
120
+
121
+-- Many servers don't support encryption or have invalid or self-signed
122
+-- certificates. You can list domains here that will not be required to
123
+-- authenticate using certificates. They will be authenticated using DNS.
124
+
125
+--s2s_insecure_domains = { "gmail.com" }
126
+
127
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
128
+-- certificates for some domains by specifying a list here.
129
+
130
+--s2s_secure_domains = { "jabber.org" }
131
+
132
+-- Required for init scripts and prosodyctl
133
+pidfile = "/var/run/prosody/prosody.pid"
134
+
135
+-- Select the authentication backend to use. The 'internal' providers
136
+-- use Prosody's configured data storage to store the authentication data.
137
+-- To allow Prosody to offer secure authentication mechanisms to clients, the
138
+-- default provider stores passwords in plaintext. If you do not trust your
139
+-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
140
+-- for information about using the hashed backend.
141
+
142
+-- authentication = "internal_plain"
143
+authentication = "internal_hashed"
144
+
145
+-- Select the storage backend to use. By default Prosody uses flat files
146
+-- in its configured data directory, but it also supports more backends
147
+-- through modules. An "sql" backend is included by default, but requires
148
+-- additional dependencies. See http://prosody.im/doc/storage for more info.
149
+
150
+--storage = "sql" -- Default is "internal"
151
+
152
+-- For the "sql" backend, you can uncomment *one* of the below to configure:
153
+--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
154
+--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
155
+--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
156
+
157
+storage = {archive2 = "sql2"}
158
+sql = { driver = "SQLite3", database = "prosody.sqlite" }
159
+default_archive_policy = "roster"
160
+
161
+-- Logging configuration
162
+-- For advanced logging see http://prosody.im/doc/logging
163
+log = {
164
+        info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
165
+        error = "/var/log/prosody/prosody.err";
166
+        "*syslog";
167
+}
168
+
169
+----------- Virtual hosts -----------
170
+-- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
171
+-- Settings under each VirtualHost entry apply *only* to that host.
172
+
173
+-- VirtualHost "localhost"
174
+
175
+VirtualHost "jitmeet.example.com"
176
+        -- enabled = false -- Remove this line to enable this host
177
+        authentication = "anonymous"
178
+        -- Assign this host a certificate for TLS, otherwise it would use the one
179
+        -- set in the global section (if any).
180
+        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
181
+        -- use the global one.
182
+        ssl = {
183
+                key = "/etc/prosody/certs/jitmeet.example.com.key";
184
+                certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
185
+        }
186
+
187
+------ Components ------
188
+-- You can specify components to add hosts that provide special services,
189
+-- like multi-user conferences, and transports.
190
+-- For more information on components, see http://prosody.im/doc/components
191
+
192
+---Set up a MUC (multi-user chat) room server on conference.example.com:
193
+--Component "conference.example.com" "muc"
194
+
195
+-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
196
+--Component "proxy.example.com" "proxy65"
197
+
198
+---Set up an external component (default component port is 5347)
199
+--
200
+-- External components allow adding various services, such as gateways/
201
+-- transports to other networks like ICQ, MSN and Yahoo. For more info
202
+-- see: http://prosody.im/doc/components#adding_an_external_component
203
+--
204
+--Component "gateway.example.com"
205
+--      component_secret = "password"
206
+
207
+Component "conference.jitmeet.example.com" "muc"
208
+
209
+Component "jitsi-videobridge.jitmeet.example.com"
210
+    component_secret = "jitmeetSecret"

BIN
debian/usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz View File


Loading…
Cancel
Save