From 2d1d429ab0e2f739adabc59df0b9c6870f8be1bf Mon Sep 17 00:00:00 2001
From: Jakub Cegan <cegan@ics.muni.cz>
Date: Tue, 4 Nov 2014 20:22:05 +0100
Subject: [PATCH] Zacisteni dokumentace #1295
---
src/warden-server/doc/INSTALL | 58 ++++++++++++++++-----------------
src/warden-server/doc/README | 12 +++----
src/warden-server/doc/UNINSTALL | 42 ++++++++++++------------
src/warden-server/doc/UPDATE | 10 +++---
4 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/warden-server/doc/INSTALL b/src/warden-server/doc/INSTALL
index 8fe6d44..8055bc4 100644
--- a/src/warden-server/doc/INSTALL
+++ b/src/warden-server/doc/INSTALL
@@ -14,7 +14,7 @@ A. Overview
-----------
For installation of warden-server package on local machine use install.sh.
-
+
For more information about install.sh options run install.sh -h.
@@ -22,8 +22,8 @@ B. Pre-installation step
------------------------
1) Install necessary packages
-
- # aptitude install apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
+
+ # aptitude install apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
C. Installation step
@@ -31,11 +31,11 @@ C. Installation step
1) Install Warden server package (examples)
- $ ./warden-server-2.2/install.sh -d /opt/warden-server -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/bundle.pem -e admin@domain.com
+ $ ./warden-server-2.2/install.sh -d /opt/warden-server -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/bundle.pem -e admin@domain.com
- or (if you want to create symlinks to Warden server control scripts during the installation process - optional)
+ or (if you want to create symlinks to Warden server control scripts during the installation process - optional)
- $ ./warden-server-2.2/install.sh -d /opt/warden-server -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/bundle.pem -e admin@domain.com -s /usr/local/bin
+ $ ./warden-server-2.2/install.sh -d /opt/warden-server -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/bundle.pem -e admin@domain.com -s /usr/local/bin
D. Post-installation steps
@@ -43,7 +43,7 @@ D. Post-installation steps
1) Enable of mod_ssl module
- # a2enmod ssl
+ # a2enmod ssl
2) Apache server configuration
@@ -52,34 +52,34 @@ D. Post-installation steps
- include parameters from the Warden server configuration file (<warden-server_path>/etc/warden-apache.conf)
- # vim /etc/apache2/sites-enabled/warden
+ # vim /etc/apache2/sites-enabled/warden
- <VirtualHost *:443>
- ...
+ <VirtualHost *:443>
+ ...
+
+ Include /opt/warden-server/etc/warden-apache.conf
+ </VirtualHost>
- Include /opt/warden-server/etc/warden-apache.conf
- </VirtualHost>
-
b) Apache server performance configuration
- # vim /etc/apache2/apache2.conf
+ # vim /etc/apache2/apache2.conf
+
+ - prefork module settings
- - prefork module settings
+ <IfModule mpm_prefork_module>
+ StartServers 2
+ MinSpareServers 4
+ MaxSpareServers 8
+ ServerLimit 700
+ MaxClients 700
+ MaxRequestsPerChild 0
+ </IfModule>
- <IfModule mpm_prefork_module>
- StartServers 2
- MinSpareServers 4
- MaxSpareServers 8
- ServerLimit 700
- MaxClients 700
- MaxRequestsPerChild 0
- </IfModule>
+ - connection settings
- - connection settings
-
- Timeout 10
- KeepAlive Off
+ Timeout 10
+ KeepAlive Off
3) MySQL database configuration
@@ -88,7 +88,7 @@ D. Post-installation steps
b) Create new database structure
- $ mysql -u <user> -h localhost -p < {warden-server_path}/doc/warden.mysql
+ $ mysql -u <user> -h localhost -p < {warden-server_path}/doc/warden.mysql
4) Warden server configuration
@@ -99,7 +99,7 @@ D. Post-installation steps
5) Restart of Apache server
- # /etc/init.d/apache2 restart
+ # /etc/init.d/apache2 restart
--------------------------------------------------------------------------------
diff --git a/src/warden-server/doc/README b/src/warden-server/doc/README
index fd8db2b..e371506 100644
--- a/src/warden-server/doc/README
+++ b/src/warden-server/doc/README
@@ -42,7 +42,7 @@ A. Overall Information
CHANGELOG
INSTALL
LICENSE
- MANIFEST
+ MANIFEST
README
UNINSTALL
UPDATE
@@ -124,7 +124,7 @@ C. Installation
-k /etc/ssl/private/server.key
-c /etc/ssl/certs/server.pem
-a /etc/ssl/certs/bundle.pem
- -e admin@domain.com
+ -e admin@domain.com
-s /usr/local/bin
4. Configuration files
@@ -235,10 +235,10 @@ E. Uninstallation
For more information about uninstall.sh options run uninstall.sh -h
Usage: uninstall.sh -d <directory> [-s <directory>] [-hV]
- -d <directory> uninstallation directory of Warden server
- -s <directory> directory for symlinks to Warden server control scripts (optional)
- -h print this help
- -V print script version number and exit
+ -d <directory> uninstallation directory of Warden server
+ -s <directory> directory for symlinks to Warden server control scripts (optional)
+ -h print this help
+ -V print script version number and exit
Example: $ uninstall.sh -d /opt/warden-server -s /usr/local/bin
diff --git a/src/warden-server/doc/UNINSTALL b/src/warden-server/doc/UNINSTALL
index f0e7b05..a1c0639 100644
--- a/src/warden-server/doc/UNINSTALL
+++ b/src/warden-server/doc/UNINSTALL
@@ -13,7 +13,7 @@ A. Overview
-----------
For uninstallation of warden-server package from local machine use uninstall.sh.
-
+
For more information about uninstall.sh options run uninstall.sh -h.
@@ -22,24 +22,24 @@ B. Uninstallation step
1) Stop Apache server
- # /etc/init.d/apache2 stop
+ # /etc/init.d/apache2 stop
2) Uninstall Warden server package (example)
- $ /opt/warden-server/uninstall.sh -d /opt/warden-server
+ $ /opt/warden-server/uninstall.sh -d /opt/warden-server
- or (if you wanted to create symlinks to Warden server control scripts during the installation process - optional)
+ or (if you wanted to create symlinks to Warden server control scripts during the installation process - optional)
- $ /opt/warden-server/uninstall.sh -d /opt/warden-server -s /usr/local/bin
+ $ /opt/warden-server/uninstall.sh -d /opt/warden-server -s /usr/local/bin
C. Post-uninstallation steps
----------------------------
1) Disable of mod_ssl module
-
- # a2dismod ssl
+
+ # a2dismod ssl
2) Remove Apache server configuration
@@ -51,12 +51,12 @@ C. Post-uninstallation steps
# vim /etc/apache2/sites-enables/warden
<VirtualHost *:443>
- ...
+ ...
Include /opt/warden-server/etc/warden-apache.conf
</VirtualHost>
-
+
b) remove Apache server performance configuration
# vim /etc/apache2/apache2.conf
@@ -64,16 +64,16 @@ C. Post-uninstallation steps
- prefork module settings
<IfModule mpm_prefork_module>
- StartServers 2
- MinSpareServers 4
- MaxSpareServers 8
- ServerLimit 700
- MaxClients 700
- MaxRequestsPerChild 0
+ StartServers 2
+ MinSpareServers 4
+ MaxSpareServers 8
+ ServerLimit 700
+ MaxClients 700
+ MaxRequestsPerChild 0
</IfModule>
- connection settings
-
+
Timeout 10
KeepAlive Off
@@ -81,18 +81,18 @@ C. Post-uninstallation steps
3) Drop MySQL database
$ mysql -u <user> -h localhost -p <password>
- mysql> DROP DATABASE warden;
- mysql> exit;
+ mysql> DROP DATABASE warden;
+ mysql> exit;
4) Uninstall unnecessary packages (optional)
-
- # aptitude remove apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
+
+ # aptitude remove apache2 mysql-server libapache2-mod-perl2 apache2-mpm-prefork
5) Start Apache server
- # /etc/init.d/apache2 start
+ # /etc/init.d/apache2 start
--------------------------------------------------------------------------------
diff --git a/src/warden-server/doc/UPDATE b/src/warden-server/doc/UPDATE
index 44f92b7..3e4fe49 100644
--- a/src/warden-server/doc/UPDATE
+++ b/src/warden-server/doc/UPDATE
@@ -22,11 +22,11 @@ B. Update steps
1) Update Warden server package (default destination path)
- $ ./warden-server-2.2/update.sh -d /opt/warden-server
+ $ ./warden-server-2.2/update.sh -d /opt/warden-server
- or (if you want to create symlinks to Warden server control scripts during the installation process - optional)
+ or (if you want to create symlinks to Warden server control scripts during the installation process - optional)
- $ ./warden-server-2.2/update.sh -d /opt/warden-server -s /usr/local/bin
+ $ ./warden-server-2.2/update.sh -d /opt/warden-server -s /usr/local/bin
C. Post-update steps
@@ -34,7 +34,7 @@ C. Post-update steps
1) Upgrade Warden server database
- $ mysql -u <user> -h localhost -p <password> < {path_to_warden_server}/doc/warden21to22.patch
+ $ mysql -u <user> -h localhost -p <password> < {path_to_warden_server}/doc/warden21to22.patch
ATTENTION: Running of the database update script may take a long time (in minutes - depending on the size of the database).
@@ -43,7 +43,7 @@ During this process the database will be not available!
2) Restart Apache server
- # /etc/init.d/apache2 restart
+ # /etc/init.d/apache2 restart
--------------------------------------------------------------------------------
--
GitLab