diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -1,5 +1,4 @@ .. -*- coding: utf-8 -*- -.. \||<-snip->|| start .. Copyright (C) 2012, Wolfgang Scherer, .. Sponsored by WIEDENMANN SEILE GMBH, http://www.wiedenmannseile.de .. @@ -12,7 +11,6 @@ .. no Back-Cover Texts. A copy of the license is included in the main .. documentation of Wiedenmann Vacation. -.. (progn (forward-line 1)(snip-insert-mode "rst_t.inline-comments" t)) .. inline comments (with ws_docutils) .. role:: rem(span) :format: '' @@ -20,29 +18,22 @@ :format: html :raw: -.. role:: ihtml(span) - :format: html -.. role:: nhtml(span) - :format: !html - ################################################## :rem:`|||:sec:|||`\ Wiedenmann Vacation ################################################## Web Front-End to Manage vacation(1) Settings ################################################## -.. \||<-snap->|| skip - -:Author: `Wolfgang Scherer`_ .. contents:: -.. \||<-snap->|| skip -.. \||<-snap->|| include ^index-header.snip$ ================================================== :rem:`|||:sec:|||`\ Installation ================================================== -#. Copy the program anywhere on your harddrive. +#. Get the sources from `ws-vacation`_ and put the program anywhere on + your harddrive:: + + >>> hg clone https://bitbucket.org/wolfmanx/ws-vacation #. Change alias `/vacation` in `lib/ws-vacation.conf.in`, if desired. @@ -53,23 +44,25 @@ Web Front-End to Manage vacation(1) Sett This substitutes the installation directory in the necessary places. -#. Copy `lib/ws-vacation.conf` to `/etc/apache2/conf.d/`. +#. Copy `lib/ws-vacation.conf` to `/etc/apache2/conf.d/`:: + + >>> sudo cp lib/ws-vacation.conf /etc/apache2/conf.d/ #. Reload the Apache server: - >>> rcapache2 reload. + >>> sudo /etc/init.d/apache2 reload. #. The sudo(1) setup allows the apache server to execute vacation(1) as any user (except root) without a password. This is activated by copying the file `lib/ws-vacation-sudo` into the directory `/etc/sudoers.d` (ubuntu): - >>> cp lib/ws-vacation-sudo /etc/sudoers.d/ws-vacation-sudo - >>> chmod 0440 /etc/sudoers.d/ws-vacation-sudo + >>> sudo cp lib/ws-vacation-sudo /etc/sudoers.d/ws-vacation-sudo + >>> sudo chmod 0440 /etc/sudoers.d/ws-vacation-sudo or by appending it to the file `/etc/sudoers` (older SuSE): - >>> cat lib/ws-vacation-sudo >>/etc/sudoers + >>> cat lib/ws-vacation-sudo | sudo tee /etc/sudoers ================================================== :rem:`|||:sec:|||`\ User Management @@ -79,9 +72,9 @@ The file `lib/.htpasswd` can be created An automated script is available that creates the password database from the system shadow(8) database. Just change into directory `lib` -and execute (as `root`): +and execute: ->>> php gen_htpasswd.php +>>> sudo php gen_htpasswd.php .. note:: If new users are created in the system, this step must be repeated to update the `.htpasswd` file. @@ -105,20 +98,6 @@ also the default vacation(1) message tex The HTML header and footer can be modified in `lib/templates.php`. -.. ================================================== -.. :rem:`|||:sec:|||`\ Footnotes -.. ================================================== - -:html:`
` - -.. \[#] - -.. ================================================== -.. :rem:`|||:sec:|||`\ References -.. ================================================== - -.. \||<-snap->|| include ^index-footer.snip$ - :rem:`|||:sec:|||`\ **Copyright** Copyright (C) 2012, Wolfgang Scherer, . @@ -146,9 +125,8 @@ Sponsored by `Wiedenmann-Seile GmbH`_. .. _`GNU Free Documentation License`: README-GFDL.html .. _`GNU General Public License`: README-COPYING.html .. _`Wiedenmann-Seile GmbH`: http://www.wiedenmannseile.de -.. _`Wolfgang Scherer`: sw@wiedenmann-seile.de - -.. \||<-snip->|| stop +.. _`Wolfgang Scherer`: mailto:sw@wiedenmann-seile.de +.. _`ws-vacation`: https://bitbucket.org/wolfmanx/ws-vacation .. ================================================== .. :rem:`|||:sec:|||`\ END