Browse Source

Updates manual install instructions.

master
Damian Minkov 10 years ago
parent
commit
497c60375c
1 changed files with 18 additions and 45 deletions
  1. 18
    45
      doc/manual-install.md

+ 18
- 45
doc/manual-install.md View File

8
 
8
 
9
 ## Install prosody
9
 ## Install prosody
10
 ```sh
10
 ```sh
11
-apt-get install lsb-release
12
-echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list
13
-wget --no-check-certificate https://prosody.im/files/prosody-debian-packages.key -O- | sudo apt-key add -
14
-apt-get update
15
-apt-get install prosody-trunk
16
-apt-get install git lua-zlib lua-sec-prosody lua-dbi-sqlite3 liblua5.1-bitop-dev liblua5.1-bitop0
11
+apt-get install prosody
17
 ```
12
 ```
18
 
13
 
19
 ## Configure prosody
14
 ## Configure prosody
20
-Modify the config file in `/etc/prosody/prosody.cfg.lua` (see also the example config file):
15
+Add config file in `/etc/prosody/conf.avail/jitsi.example.com.cfg.lua` :
16
+
17
+- add your domain virtual host section:
21
 
18
 
22
-- modules to enable/add: compression, bosh, smacks, carbons, mam, lastactivity, offline, pubsub, adhoc, websocket, http_altconnect
23
-- comment out: `c2s_require_encryption = true`, and `s2s_secure_auth = false`
24
-- change `authentication = "internal_hashed"`
25
-- add this:
26
-```
27
-daemonize = true
28
-cross_domain_bosh = true;
29
-storage = {archive2 = "sql2"}
30
-sql = { driver = "SQLite3", database = "prosody.sqlite" }
31
-default_archive_policy = "roster"
32
-```
33
-- configure your domain by editing the example.com virtual host section section:
34
 ```
19
 ```
35
 VirtualHost "jitsi.example.com"
20
 VirtualHost "jitsi.example.com"
36
     authentication = "anonymous"
21
     authentication = "anonymous"
38
         key = "/var/lib/prosody/jitsi.example.com.key";
23
         key = "/var/lib/prosody/jitsi.example.com.key";
39
         certificate = "/var/lib/prosody/jitsi.example.com.crt";
24
         certificate = "/var/lib/prosody/jitsi.example.com.crt";
40
     }
25
     }
26
+    modules_enabled = {
27
+        "bosh";
28
+        "pubsub";
29
+    }
41
 ```
30
 ```
42
 - add domain with authentication for conference focus user:
31
 - add domain with authentication for conference focus user:
43
 ```
32
 ```
44
 VirtualHost "auth.jitsi.example.com"
33
 VirtualHost "auth.jitsi.example.com"
45
     authentication = "internal_plain"
34
     authentication = "internal_plain"
46
-    ssl = {
47
-        key = "/var/lib/prosody/jitsi.example.com.key";
48
-        certificate = "/var/lib/prosody/jitsi.example.com.crt";
49
-    }
50
 ```
35
 ```
51
 - add focus user to server admins:
36
 - add focus user to server admins:
52
 ```
37
 ```
61
     component_secret = "YOURSECRET2"
46
     component_secret = "YOURSECRET2"
62
 ```
47
 ```
63
 
48
 
49
+Add link for the added configuration
50
+```sh
51
+ln -s /etc/prosody/conf.avail/jitsi.example.com.cfg.lua /etc/prosody/conf.d/jitsi.example.com.cfg.lua
52
+```
53
+
64
 Generate certs for the domain:
54
 Generate certs for the domain:
65
 ```sh
55
 ```sh
66
 prosodyctl cert generate jitsi.example.com
56
 prosodyctl cert generate jitsi.example.com
81
 apt-get install nginx
71
 apt-get install nginx
82
 ```
72
 ```
83
 
73
 
84
-Optionally, add nginx config for domain in `/etc/nginx/nginx.conf`:
74
+Add a new file `jitsi.example.com` in `/etc/nginx/sites-available` (see also the example config file):
85
 ```
75
 ```
86
-tcp_nopush on;
87
-types_hash_max_size 2048;
88
 server_names_hash_bucket_size 64;
76
 server_names_hash_bucket_size 64;
89
-```
90
 
77
 
91
-Add a new file `jitsi.example.com` in `/etc/nginx/sites-available` (see also the example config file):
92
-```
93
 server {
78
 server {
94
     listen 80;
79
     listen 80;
95
     server_name jitsi.example.com;
80
     server_name jitsi.example.com;
96
     # set the root
81
     # set the root
97
     root /srv/jitsi.example.com;
82
     root /srv/jitsi.example.com;
98
     index index.html;
83
     index index.html;
99
-    location ~ ^/([a-zA-Z0-9]+)$ {
84
+    location ~ ^/([a-zA-Z0-9=\?]+)$ {
100
         rewrite ^/(.*)$ / break;
85
         rewrite ^/(.*)$ / break;
101
     }
86
     }
87
+    location / {
88
+        ssi on;
89
+    }
102
     # BOSH
90
     # BOSH
103
     location /http-bind {
91
     location /http-bind {
104
         proxy_pass      http://localhost:5280/http-bind;
92
         proxy_pass      http://localhost:5280/http-bind;
105
         proxy_set_header X-Forwarded-For $remote_addr;
93
         proxy_set_header X-Forwarded-For $remote_addr;
106
         proxy_set_header Host $http_host;
94
         proxy_set_header Host $http_host;
107
     }
95
     }
108
-    # xmpp websockets
109
-    location /xmpp-websocket {
110
-        proxy_pass http://localhost:5280;
111
-        proxy_http_version 1.1;
112
-        proxy_set_header Upgrade $http_upgrade;
113
-        proxy_set_header Connection "upgrade";
114
-        proxy_set_header Host $host;
115
-        tcp_nodelay on;
116
-    }
117
 }
96
 }
118
 ```
97
 ```
119
 
98
 
123
 ln -s ../sites-available/jitsi.example.com jitsi.example.com
102
 ln -s ../sites-available/jitsi.example.com jitsi.example.com
124
 ```
103
 ```
125
 
104
 
126
-## Fix firewall if needed
127
-```sh
128
-ufw allow 80
129
-ufw allow 5222
130
-```
131
-
132
 ## Install Jitsi Videobridge
105
 ## Install Jitsi Videobridge
133
 ```sh
106
 ```sh
134
 wget https://download.jitsi.org/jitsi-videobridge/linux/jitsi-videobridge-linux-{arch-buildnum}.zip
107
 wget https://download.jitsi.org/jitsi-videobridge/linux/jitsi-videobridge-linux-{arch-buildnum}.zip

Loading…
Cancel
Save