From edbcfa7ed03fad47a94feee3872e0075ee2ae682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz> Date: Mon, 10 Jan 2022 12:44:09 +0100 Subject: [PATCH] Change default paths to more generic ones --- warden_ra/apache22.conf | 6 +++--- warden_ra/apache24.conf | 6 +++--- warden_ra/warden_ra.py | 2 +- warden_server/README | 5 ++--- warden_server/apache22.conf.dist | 10 +++++----- warden_server/apache24.conf.dist | 10 +++++----- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/warden_ra/apache22.conf b/warden_ra/apache22.conf index 93ca7f8..8d8edd0 100644 --- a/warden_ra/apache22.conf +++ b/warden_ra/apache22.conf @@ -3,9 +3,9 @@ SSLEngine on SSLVerifyClient optional SSLOptions +StdEnvVars +ExportCertData -SSLCertificateFile /opt/warden_server_3/cert.pem -SSLCertificateKeyFile /opt/warden_server_3/key.pem -SSLCACertificateFile /opt/warden_server_3/chain_TERENA_SSL_CA_3.pem +SSLCertificateFile /opt/warden_server/cert.pem +SSLCertificateKeyFile /opt/warden_server/key.pem +SSLCACertificateFile /opt/warden_server/chain_TERENA_SSL_CA_3.pem WSGIScriptAlias /warden_ra /opt/warden-ra/warden_ra.wsgi diff --git a/warden_ra/apache24.conf b/warden_ra/apache24.conf index 8f567e5..1c9dee8 100644 --- a/warden_ra/apache24.conf +++ b/warden_ra/apache24.conf @@ -3,9 +3,9 @@ SSLEngine on SSLVerifyClient optional SSLOptions +StdEnvVars +ExportCertData -SSLCertificateFile /opt/warden_server_3/cert.pem -SSLCertificateKeyFile /opt/warden_server_3/key.pem -SSLCACertificateFile /opt/warden_server_3/chain_TERENA_SSL_CA_3.pem +SSLCertificateFile /opt/warden_server/cert.pem +SSLCertificateKeyFile /opt/warden_server/key.pem +SSLCACertificateFile /opt/warden_server/chain_TERENA_SSL_CA_3.pem WSGIScriptAlias /warden_ra /opt/warden-ra/warden_ra.wsgi diff --git a/warden_ra/warden_ra.py b/warden_ra/warden_ra.py index af85ba8..dd28434 100755 --- a/warden_ra/warden_ra.py +++ b/warden_ra/warden_ra.py @@ -35,7 +35,7 @@ else: import ConfigParser # usual path to warden server -sys.path.append(pth.join(pth.dirname(__file__), "..", "warden-server")) +sys.path.append(pth.join(pth.dirname(__file__), "..", "warden_server")) import warden_server from warden_server import Request, ObjectBase, FileLogger, SysLogger, Server, expose, read_cfg diff --git a/warden_server/README b/warden_server/README index 68d3173..83cd7cc 100644 --- a/warden_server/README +++ b/warden_server/README @@ -58,8 +58,7 @@ C. Installation # cd /opt # tar xjf warden_server_3.0.tar.bz2 - # ls - warden_server_3.0 + # mv warden_server_3.0 warden_server * Create database and desired database users (We're using db "warden3" and user "warden@localhost" as an example.) @@ -80,7 +79,7 @@ C. Installation This depends heavily on your distribution and Apache configuration. Basically you need to create and include apache.conf: - Include /opt/warden_server_3.0/apache.conf + Include /opt/warden_server/apache.conf or paste the contents into whichever Directory, Location or VirtualHost you dedicate for Warden. You can use apache22.conf.dist or diff --git a/warden_server/apache22.conf.dist b/warden_server/apache22.conf.dist index 353e4d3..5d00563 100644 --- a/warden_server/apache22.conf.dist +++ b/warden_server/apache22.conf.dist @@ -6,13 +6,13 @@ SSLOptions +StdEnvVars +ExportCertData #SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL -SSLCertificateFile /opt/warden_server_3/etc/cert.pem -SSLCertificateKeyFile /opt/warden_server_3/etc/key.pem -SSLCACertificateFile /opt/warden_server_3/etc/tcs-ca-bundle.pem +SSLCertificateFile /opt/warden_server/etc/cert.pem +SSLCertificateKeyFile /opt/warden_server/etc/key.pem +SSLCACertificateFile /opt/warden_server/etc/tcs-ca-bundle.pem -WSGIScriptAlias /warden3 /opt/warden_server_3/warden_server.wsgi +WSGIScriptAlias /warden3 /opt/warden_server/warden_server.wsgi -<Directory /opt/warden_server_3/warden_server.wsgi> +<Directory /opt/warden_server/warden_server.wsgi> Order allow,deny Allow from all </Directory> diff --git a/warden_server/apache24.conf.dist b/warden_server/apache24.conf.dist index 6a1e367..5e4e983 100644 --- a/warden_server/apache24.conf.dist +++ b/warden_server/apache24.conf.dist @@ -6,12 +6,12 @@ SSLOptions +StdEnvVars +ExportCertData #SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL -SSLCertificateFile /opt/warden_server_3/etc/cert.pem -SSLCertificateKeyFile /opt/warden_server_3/etc/key.pem -SSLCACertificateFile /opt/warden_server_3/etc/tcs-ca-bundle.pem +SSLCertificateFile /opt/warden_server/etc/cert.pem +SSLCertificateKeyFile /opt/warden_server/etc/key.pem +SSLCACertificateFile /opt/warden_server/etc/tcs-ca-bundle.pem -WSGIScriptAlias /warden3 /opt/warden_server_3/warden_server.wsgi +WSGIScriptAlias /warden3 /opt/warden_server/warden_server.wsgi -<DirectoryMatch /opt/warden_server_3/warden_server.wsgi> +<DirectoryMatch /opt/warden_server/warden_server.wsgi> Require all granted </DirectoryMatch> -- GitLab