105,7 → 105,7 |
|
# Message of the day file |
-#motd_path = "$prefix/etc/motd.html" |
+#motd_path = "/etc/motd.html" |
+#motd_path = "/etc/prayer/motd.html" |
|
# Login page suffix |
-#login_suffix_path = "$prefix/etc/login_suffix.html" |
113,19 → 113,31 |
|
# Login security: Prayer's front page defaults to a login form. |
# If the user does not connect via SSL then this can be changed |
@@ -423,10 +411,7 @@ bin_dir = "__BIN_DIR__" |
@@ -409,9 +397,6 @@ ssl_required = FALSE |
# Session banner (local HTML inserted into each page of login session) |
#session_banner_path = "$prefix/etc/session_banner.html" |
|
-# Location of help files |
-help_dir = "$prefix/help" |
- |
# Location of icon files |
icon_dir = "$prefix/icons" |
|
@@ -423,10 +408,11 @@ bin_dir = "__BIN_DIR__" |
|
# Various directories used by the running system |
# Logs stored in $log_dir |
-log_dir = "$var_prefix/logs" |
- |
-# $lock_dir used for interlocking between prayer processes |
-lock_dir = "$var_prefix/locks" |
+log_dir = "/var/log/prayer" |
|
# $lock_dir used for interlocking between prayer processes |
-lock_dir = "$var_prefix/locks" |
+# (only on Debian GNU/kFreeBSD) |
+lock_dir = "$var_prefix" |
|
# $socket_dir is location for unix domain sockets which connect frontend |
# to backend in proxy mode of operation. |
@@ -434,7 +419,7 @@ socket_dir = "$var_prefix/socke |
@@ -434,7 +420,7 @@ socket_dir = "$var_prefix/socke |
|
# Split socket directory into 64 subdirs keyed on first letter of sessionID |
# Code provides compatibility in both directions: can switch back and forward |
134,7 → 146,7 |
|
# Name of Unix domain socket (in $socket_dir) used for initial handshake |
# between prayer and prayer-session processes when a user logs in |
@@ -448,7 +433,7 @@ ssl_session_dir = "$var_prefix/ssl_s |
@@ -448,7 +434,7 @@ ssl_session_dir = "$var_prefix/ssl_s |
tmp_dir = "$var_prefix/tmp" |
|
# Location for PID files for prayer and prayer-session master processes. |
143,7 → 155,7 |
|
# Interface to Hermes finger database |
#lookup_rpasswd = "/data/finger/rpasswd.cdb" |
@@ -609,14 +594,14 @@ hiersep = "/" |
@@ -609,14 +595,14 @@ hiersep = "/" |
dualuse = FALSE |
|
# Names of postponed_folder and sent_mail_folder, relative to maildir |
163,7 → 175,12 |
small_cols = 80 |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -2144,7 +2144,6 @@ BOOL config_check(struct config * config |
@@ -2139,12 +2139,10 @@ BOOL config_check(struct config * config |
struct config_http_port *chp; |
char hostname[MAX_ADDRESS+1], domainname[MAX_ADDRESS+1]; |
|
- TEST_STRING(config->help_dir, "help_dir"); |
TEST_STRING(config->icon_dir, "icon_dir"); |
TEST_STRING(config->socket_dir, "socket_dir"); |
TEST_STRING(config->init_socket_name, "init_socket_name"); |
TEST_STRING(config->ssl_session_dir, "ssl_session_dir"); |