Bläddra i källkod

Complements Apache2 documentation

Adrien Panay 7 år sedan
förälder
incheckning
3ac5661144
1 ändrade filer med 11 tillägg och 21 borttagningar
  1. 11 21
      doc/apache.md

+ 11 - 21
doc/apache.md Visa fil

@@ -1,17 +1,5 @@
1 1
 # Running Tracim through Apache #
2 2
 
3
-## Tracim WSGI application script ##
4
-
5
-Copy a `WSGI` application script:
6
-
7
-    cp tracim/app.wsgi tracim/productionapp.wsgi
8
-
9
-Edit this last's `APP_CONFIG` variable to match your environment:
10
-
11
-    APP_CONFIG = "/var/www/tracim/tracim/production.ini"
12
-
13
-## Apache WSGI ##
14
-
15 3
 ### Installation ###
16 4
 
17 5
 Install `Apache` server and its [`WSGI` module](https://github.com/GrahamDumpleton/mod_wsgi):
@@ -23,13 +11,13 @@ Install `Apache` server and its [`WSGI` module](https://github.com/GrahamDumplet
23 11
 Create a file named `/etc/apache2/sites-available/tracim.conf` containing:
24 12
 
25 13
     <VirtualHost *:80>
26
-        ServerAdmin webmaster@tracim.mycompany.com
27
-        ServerName localhost/tracim
14
+        ServerName tracim.mycompany.com
15
+
16
+        WSGIDaemonProcess tracim.mycompany.com user=www-data group=www-data threads=4 python-home=/var/www/tracim/tg2env python-path=/var/www/tracim/tracim lang='C.UTF-8' locale='C.UTF-8'
17
+        WSGIProcessGroup tracim.mycompany.com
18
+
19
+        WSGIScriptAlias / /var/www/tracim/tracim/app.wsgi process-group=tracim.mycompany.com
28 20
 
29
-        WSGIProcessGroup localhost/tracim
30
-        WSGIDaemonProcess localhost/tracim user=www-data group=www-data threads=4 python-path=/home/algooapy/Documents/dev/py/tracim/tg2env/lib/python3.5/site-packages
31
-        # WSGIScriptAlias / /var/www/tracim/tracim/productionapp.wsgi
32
-        WSGIScriptAlias /tracim /var/www/tracim/tracim/app.wsgi
33 21
         <Directory "/var/www/tracim/tracim">
34 22
             <Files "app.wsgi">
35 23
                 Require all granted
@@ -37,12 +25,14 @@ Create a file named `/etc/apache2/sites-available/tracim.conf` containing:
37 25
         </Directory>
38 26
 
39 27
         #Serve static files directly without TurboGears
40
-        Alias /assets      /var/www/tracim/tracim/tracim/public/assets
41
-        Alias /favicon.ico /var/www/tracim/tracim/tracim/public/favicon.ico
28
+        Alias /assets          /var/www/tracim/tracim/tracim/public/assets
29
+        Alias /_caldavzap      /var/www/tracim/tracim/tracim/public/_caldavzap
30
+        # Alias /calendar_config /var/www/tracim/tracim/tracim/public/ ?????????
31
+        Alias /favicon.ico     /var/www/tracim/tracim/tracim/public/favicon.ico
42 32
 
43 33
         CustomLog ${APACHE_LOG_DIR}/tracim_access_log combined
44 34
         ErrorLog ${APACHE_LOG_DIR}/tracim_error_log
45
-        LogLevel debug
35
+        LogLevel info
46 36
     </VirtualHost>
47 37
 
48 38
 Enable this site configuration file: