13,7 → 13,7 |
aliases_name = "vacation.aliases" |
--- a/files/Makefile |
+++ b/files/Makefile |
@@ -65,26 +65,21 @@ install-aconfig: |
@@ -65,21 +65,17 @@ install-aconfig: |
|
install-motd: |
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ |
20,11 → 20,6 |
- etc/motd.html ${BROOT}${PREFIX}/etc |
+ etc/motd.html ${BROOT}/etc/prayer |
|
install-welcome: |
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ |
- etc/welcome.html ${BROOT}${PREFIX}/etc |
+ etc/welcome.html ${BROOT}/etc/prayer |
|
install: |
- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \ |
- RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \ |
42,7 → 37,6 |
if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi |
if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi |
- if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi |
- if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi |
+ if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi |
+ if [ ! -f $(BROOT)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi |
|
59,7 → 53,7 |
|
# Run prayer as background process. |
# TRUE => will return as soon as valid configuration is found. |
@@ -271,11 +271,11 @@ http_icon_embed = TRUE |
@@ -266,11 +266,11 @@ http_icon_embed = TRUE |
|
# Locatation of SSL certificate file (only used if SSL ports defined). |
# Required if we are going to provide SSL services. |
73,7 → 67,7 |
|
# Master server will regenerate shared RSA key at this interval: |
ssl_rsakey_lifespan = 15m |
@@ -283,26 +283,14 @@ ssl_rsakey_lifespan = 15m |
@@ -278,26 +278,14 @@ ssl_rsakey_lifespan = 15m |
# RSA key remains fresh in child process for this long after first actual use. |
ssl_rsakey_freshen = 15m |
|
103,7 → 97,7 |
# Session specific configuration |
|
# Session switches to idle mode after this much time: connections to IMAP |
@@ -387,13 +375,13 @@ ispell_path = /usr/bin/ispell |
@@ -382,13 +370,13 @@ ispell_path = /usr/bin/ispell |
# <login_suffix_path> |
|
# Login page prefix |
120,19 → 114,19 |
|
# Login security: Prayer's front page defaults to a login form. |
# If the user does not connect via SSL then this can be changed |
@@ -431,10 +419,7 @@ bin_dir = "__BIN_DIR__" |
@@ -423,10 +411,7 @@ bin_dir = "__BIN_DIR__" |
|
# Various directories used by the running system |
# Logs stored in $log_dir |
-log_dir = "$var_prefix/logs" |
+log_dir = "/var/log/prayer" |
- |
-# $lock_dir used for interlocking between prayer processes |
-lock_dir = "$var_prefix/locks" |
+log_dir = "/var/log/prayer" |
|
# $socket_dir is location for unix domain sockets which connect frontend |
# to backend in proxy mode of operation. |
@@ -442,7 +427,7 @@ socket_dir = "$var_prefix/socke |
@@ -434,7 +419,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 |
141,7 → 135,7 |
|
# Name of Unix domain socket (in $socket_dir) used for initial handshake |
# between prayer and prayer-session processes when a user logs in |
@@ -453,10 +438,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
@@ -445,10 +430,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
|
# Location for temporary files e.g; attachments and folders in transist |
# during upload and download operation. Core files also end up here |
154,7 → 148,7 |
|
# Interface to Hermes finger database |
#lookup_rpasswd = "/data/finger/rpasswd.cdb" |
@@ -617,14 +602,14 @@ hiersep = "/" |
@@ -609,14 +594,14 @@ hiersep = "/" |
dualuse = FALSE |
|
# Names of postponed_folder and sent_mail_folder, relative to maildir |