| 126,7 → 126,7 |
| - ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR} |
| -fi |
| - |
| for i in icons |
| for i in icons static |
| do |
| if [ -d "${PREFIX}/${i}" ]; then |
| --- a/files/etc/prayer.cf.SRC |
| 140,20 → 140,80 |
| |
| # Run prayer as background process. |
| # TRUE => will return as soon as valid configuration is found. |
| @@ -428,10 +428,10 @@ bin_dir = "__BIN_DIR__" |
| @@ -271,11 +271,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. |
| -ssl_cert_file = "$prefix/certs/prayer.pem" |
| +ssl_cert_file = "/etc/ssl/certs/ssl-cert-snakeoil.pem" |
| |
| # Locatation of SSL private key file (only used if SSL ports defined). |
| # Required if we are going to provide SSL services. |
| -ssl_privatekey_file = "$prefix/certs/prayer.pem" |
| +ssl_privatekey_file = "/etc/ssl/private/ssl-cert-snakeoil.key" |
| |
| # Master server will regenerate shared RSA key at this interval: |
| ssl_rsakey_lifespan = 15m |
| @@ -283,26 +283,14 @@ ssl_rsakey_lifespan = 15m |
| # RSA key remains fresh in child process for this long after first actual use. |
| ssl_rsakey_freshen = 15m |
| |
| -# SSL session cache timeout. |
| -ssl_session_timeout = 24h |
| +# SSL session cache timeout. Uncomment to enable SSL session caching. |
| +# You should also arrange for prayer-ssl-prune to be run periodically. |
| +#ssl_session_timeout = 24h |
| |
| # EGD socket, if system has no /dev/urandom |
| #egd_socket = "/var/prngd/urandom" |
| |
| ###################################################################### |
| - |
| -# Direct connection stuff. Experimental! Leave this well alone unless you |
| -# understand what it is for (DESIGN document provides detail for the curious). |
| -direct_enable = FALSE |
| - |
| -# Following four options just define a set of (non-overlapping) ports for |
| -# SSL and plaintext use if direct connection mode is enabled. |
| -direct_ssl_first = 5000 |
| -direct_ssl_count = 1000 |
| -direct_plain_first = 4000 |
| -direct_plain_count = 1000 |
| - |
| -###################################################################### |
| # Session specific configuration |
| |
| # Session switches to idle mode after this much time: connections to IMAP |
| @@ -387,13 +375,13 @@ ispell_path = /usr/bin/ispell |
| # <login_suffix_path> |
| |
| # Login page prefix |
| -#login_prefix_path = "$prefix/etc/login_prefix.html" |
| +#login_prefix_path = "/etc/login_prefix.html" |
| |
| # Message of the day file |
| -#motd_path = "$prefix/etc/motd.html" |
| +#motd_path = "/etc/motd.html" |
| |
| # Login page suffix |
| -#login_suffix_path = "$prefix/etc/login_suffix.html" |
| +#login_suffix_path = "/etc/login_suffix.html" |
| |
| # 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__" |
| |
| # 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 used for interlocking between prayer processes |
| -lock_dir = "$var_prefix/locks" |
| +lock_dir = "/var/lock" |
| |
| # $socket_dir is location for unix domain sockets which connect frontend |
| # to backend in proxy mode of operation. |
| @@ -439,7 +439,7 @@ socket_dir = "$var_prefix/socke |
| @@ -442,7 +427,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 |
| 162,7 → 222,7 |
| |
| # Name of Unix domain socket (in $socket_dir) used for initial handshake |
| # between prayer and prayer-session processes when a user logs in |
| @@ -450,10 +450,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
| @@ -453,10 +438,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 |
| 175,7 → 235,16 |
| |
| # Interface to Hermes finger database |
| #lookup_rpasswd = "/data/finger/rpasswd.cdb" |
| @@ -621,7 +621,7 @@ sent_mail_folder = "sent-mail" |
| @@ -617,14 +602,14 @@ hiersep = "/" |
| dualuse = FALSE |
| |
| # Names of postponed_folder and sent_mail_folder, relative to maildir |
| -postponed_folder = "postponed-msgs" |
| -sent_mail_folder = "sent-mail" |
| +postponed_folder = "Drafts" |
| +sent_mail_folder = "Sent" |
| |
| # Default domain for outgoing mail. Defaults to "$hostname". |
| # default_domain = "<valid mail domain>" |
| |
| # Language for ispell. |