From 1733c696e56d53be21bf02c67c34258eb0bb714a Mon Sep 17 00:00:00 2001 From: Fabien LOISON Date: Thu, 4 Aug 2011 17:00:45 +0200 Subject: [PATCH 1/4] Apache2 mod_wsgi section added in the user documentation --- pages/user_documentation.rst | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pages/user_documentation.rst b/pages/user_documentation.rst index a8c04494..5221d095 100644 --- a/pages/user_documentation.rst +++ b/pages/user_documentation.rst @@ -340,6 +340,46 @@ options. These options are available by typing:: radicale --help +Use Radicale with Apache2 and mod_wsgi +-------------------------------------- + +For using Radicale with Apache's ``mod_wsgi``, you first have to write +your ``.wsgi`` file (in ``/var/www`` for example): + +.. code-block:: python + + import radicale + application = radicale.Application() + +.. note:: + We assume that Radicale is installed in your Python path. + +Next you have to create the apache virtual host (adapt the configuration +to your environment): + +.. code-block:: apache + + + ServerName cal.yourdomaine.org + + WSGIDaemonProcess radicale user=www-data group=www-data threads=1 + WSGIScriptAlias / /var/www/radicale.wsgi + + + WSGIProcessGroup radicale + WSGIApplicationGroup %{GLOBAL} + AllowOverride None + Order allow,deny + allow from all + + + +.. note:: + You should use the root of the (sub)domain (``WSGIScriptAlias /``), else + some CalDAV features will not work. + + + Authentication and URLs ----------------------- From a101e8e47a7f82a14bc95ac752f4aeb8f4aa084b Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Fri, 12 Aug 2011 12:26:55 +0200 Subject: [PATCH 2/4] Small documentation fixes --- pages/home.rst | 2 ++ pages/user_documentation.rst | 56 +++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/pages/home.rst b/pages/home.rst index 287e8570..bd069719 100644 --- a/pages/home.rst +++ b/pages/home.rst @@ -24,6 +24,8 @@ Radicale runs on most of the UNIX-like platforms (Linux, \*BSD, MacOS X) and Windows. It is free and open-source software, written in Python, released under GPL version 3. +.. log:: + Main Features ============= diff --git a/pages/user_documentation.rst b/pages/user_documentation.rst index 5221d095..7cdfaea1 100644 --- a/pages/user_documentation.rst +++ b/pages/user_documentation.rst @@ -340,44 +340,54 @@ options. These options are available by typing:: radicale --help -Use Radicale with Apache2 and mod_wsgi --------------------------------------- +WSGI, CGI and FastCGI +--------------------- -For using Radicale with Apache's ``mod_wsgi``, you first have to write -your ``.wsgi`` file (in ``/var/www`` for example): +Radicale comes with a `WSGI `_ support, allowing the software +to be used behind any HTTP server supporting WSGI such as Apache. + +Moreover, it is possible to use `flup +`_ to wrap Radicale into a CGI, +FastCGI, SCGI or AJP application, and therefore use it with Lighttpd, Nginx or +even Tomcat. + +Apache and mod_wsgi +~~~~~~~~~~~~~~~~~~~ + +To use Radicale with Apache's ``mod_wsgi``, you first have to write your +``.wsgi`` file (in ``/var/www`` for example): .. code-block:: python - import radicale - application = radicale.Application() + import radicale + application = radicale.Application() .. note:: - We assume that Radicale is installed in your Python path. + We assume that the Radicale module is installed in your Python path. -Next you have to create the apache virtual host (adapt the configuration +Next you have to create the Apache virtual host (adapt the configuration to your environment): .. code-block:: apache - - ServerName cal.yourdomaine.org + + ServerName cal.yourdomain.org - WSGIDaemonProcess radicale user=www-data group=www-data threads=1 - WSGIScriptAlias / /var/www/radicale.wsgi + WSGIDaemonProcess radicale user=www-data group=www-data threads=1 + WSGIScriptAlias / /var/www/radicale.wsgi - - WSGIProcessGroup radicale - WSGIApplicationGroup %{GLOBAL} - AllowOverride None - Order allow,deny - allow from all - - + + WSGIProcessGroup radicale + WSGIApplicationGroup %{GLOBAL} + AllowOverride None + Order allow,deny + allow from all + + .. note:: - You should use the root of the (sub)domain (``WSGIScriptAlias /``), else - some CalDAV features will not work. - + You should use the root of the (sub)domain (``WSGIScriptAlias /``), else + some CalDAV features will not work. Authentication and URLs From cfb88170ff3ad180f048a8084726264c82337ca2 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Fri, 12 Aug 2011 12:28:01 +0200 Subject: [PATCH 3/4] Use the YAML configuration file --- configuration | 10 ---------- configuration.yaml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) delete mode 100644 configuration create mode 100644 configuration.yaml diff --git a/configuration b/configuration deleted file mode 100644 index f5be485d..00000000 --- a/configuration +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "Radicale", - "description": "CalDAV Server", - "menu": [ - {"name": "News", "link": "/news/"}, - {"name": "Documentation", "link": "/documentation/"}, - {"name": "Contribute", "link": "/contribute/"}, - {"name": "Download", "link": "/download/"} - ] -} diff --git a/configuration.yaml b/configuration.yaml new file mode 100644 index 00000000..5c80b545 --- /dev/null +++ b/configuration.yaml @@ -0,0 +1,46 @@ +name: Radicale +description: CalDAV Server +license: GPLv3 +public: true +url: http://www.radicale.org/ + +menu: + - News: + link: /news/ + - Documentation: + link: /documentation/ + - Contribute: + link: /contribute/ + - Download: + link: /download/ + +vcs: + git: + url: git://gitorious.org/radicale/radicale.git + path: /home/lize/Informatique/radicale + +code browser: + gitorious: + project name: radicale + repository name: radicale + redmine: + base url: http://redmine.kozea.fr/ + project name: radicale + +bug tracker: + redmine: + base url: http://redmine.kozea.fr/ + project name: radicale + database: /var/ + +mailing list: + mbox: + folder: /var/local/ + +room: + jabber: + address: radicale@room.jabber.kozea.fr + +package repository: + pypi: + project name: radicale From 2772c75ec54f99871f207bf91825651c724a8981 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Fri, 12 Aug 2011 14:44:04 +0200 Subject: [PATCH 4/4] Remove the log directive --- pages/home.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/home.rst b/pages/home.rst index bd069719..287e8570 100644 --- a/pages/home.rst +++ b/pages/home.rst @@ -24,8 +24,6 @@ Radicale runs on most of the UNIX-like platforms (Linux, \*BSD, MacOS X) and Windows. It is free and open-source software, written in Python, released under GPL version 3. -.. log:: - Main Features =============