From 9a2cc8407db6bb3eff7ffa195b730e2cca4f7042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Fri, 17 Apr 2015 14:57:59 +0200
Subject: [PATCH] Rename files, which _have_ to be changed by administrator, to
*.dist
---
...rden_client.cfg => warden_client.cfg.dist} | 0
warden3/warden_server/README | 19 +++++++++++--------
.../{apache.conf => apache.conf.dist} | 0
...rden_server.cfg => warden_server.cfg.dist} | 0
...en_server.wsgi => warden_server.wsgi.dist} | 0
5 files changed, 11 insertions(+), 8 deletions(-)
rename warden3/warden_client/{warden_client.cfg => warden_client.cfg.dist} (100%)
rename warden3/warden_server/{apache.conf => apache.conf.dist} (100%)
rename warden3/warden_server/{warden_server.cfg => warden_server.cfg.dist} (100%)
rename warden3/warden_server/{warden_server.wsgi => warden_server.wsgi.dist} (100%)
diff --git a/warden3/warden_client/warden_client.cfg b/warden3/warden_client/warden_client.cfg.dist
similarity index 100%
rename from warden3/warden_client/warden_client.cfg
rename to warden3/warden_client/warden_client.cfg.dist
diff --git a/warden3/warden_server/README b/warden3/warden_server/README
index e60843f..fd448be 100644
--- a/warden3/warden_server/README
+++ b/warden3/warden_server/README
@@ -74,17 +74,19 @@ C. Installation
* Enable mod_wsgi, mod_ssl, include Warden configuration
This depends heavily on your distribution and Apache configuration.
- Basically you need to
+ Basically you need to create and include apache.conf:
Include /opt/warden_server_3.0/apache.conf
or paste the contents into whichever Directory, Location or VirtualHost
- you dedicate for Warden.
+ you dedicate for Warden. You can use apache.conf.dist as an example.
- You may also need to change paths to certificate/key/ca material, path
- to extracted warden_server.wsgi and web path alias.
+ You may need to change paths to certificate/key/ca material, path to
+ warden_server.wsgi and web path alias.
- You may also need to change configuration file path in warden_server.wsgi.
+ Also, for warden_server.wsgi, you can use warden_server.wsgi.dist as
+ a template. You will possibly need to change at least configuration
+ file path.
* Configure Warden server (see next chapter)
@@ -93,9 +95,10 @@ C. Installation
------------------------------------------------------------------------------
D. Configuration
- Configuration is JSON object in file - however, lines starting with "#"
-or "//" are allowed and will be ignored as comments. File must contain valid
-JSON object, containing configuration. See also warden_server.cfg as example.
+ Configuration is JSON object in file (warden_server.cfg by default),
+however, lines starting with "#" or "//" are allowed and will be ignored as
+comments. File must contain valid JSON object, containing configuration. See
+also warden_server.cfg.dist as example.
Top level JSON object contains subsections, which configure particular
aspect of the server. Each subsection can contain "type" key, which chooses
diff --git a/warden3/warden_server/apache.conf b/warden3/warden_server/apache.conf.dist
similarity index 100%
rename from warden3/warden_server/apache.conf
rename to warden3/warden_server/apache.conf.dist
diff --git a/warden3/warden_server/warden_server.cfg b/warden3/warden_server/warden_server.cfg.dist
similarity index 100%
rename from warden3/warden_server/warden_server.cfg
rename to warden3/warden_server/warden_server.cfg.dist
diff --git a/warden3/warden_server/warden_server.wsgi b/warden3/warden_server/warden_server.wsgi.dist
similarity index 100%
rename from warden3/warden_server/warden_server.wsgi
rename to warden3/warden_server/warden_server.wsgi.dist
--
GitLab