Subversion Repositories

?revision_form?Rev ?revision_input??revision_submit??revision_endform?

Rev 23 | Rev 48 | Go to most recent revision | Details | Compare with Previous | Last modification | View Log | RSS feed

Rev Author Line No. Line
12 magnus 1
--- a/files/etc/prayer-accountd.cf
2
+++ b/files/etc/prayer-accountd.cf
15 magnus 3
@@ -8,6 +8,10 @@
3 magnus 4
 # Default accountd.cf file suitable for RedHat Linux only.
5
 # See distribution for some sample files for FreeBSD and Solaris
6
 
7
+accountd_port = 145
8
+
15 magnus 9
+authtype = pam
10
+
3 magnus 11
 msforward_name      = ".MSforward"
12
 forward_name        = ".forward"
13
 aliases_name        = "vacation.aliases"
12 magnus 14
--- a/files/Makefile
15
+++ b/files/Makefile
23 magnus 16
@@ -65,26 +65,29 @@ install-aconfig:
3 magnus 17
 
18
 install-motd:
19
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
20
-       etc/motd.html ${BROOT}${PREFIX}/etc
23 magnus 21
+       etc/motd.html ${BROOT}/etc/prayer
3 magnus 22
 
23
 install-welcome:
24
        $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
25
-       etc/welcome.html ${BROOT}${PREFIX}/etc
23 magnus 26
+       etc/welcome.html ${BROOT}/etc/prayer
3 magnus 27
 
28
 install:
23 magnus 29
+       ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}${PREFIX}
30
+       ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BROOT}/etc/prayer
3 magnus 31
+
23 magnus 32
        PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
3 magnus 33
        RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \
34
        RW_USER=$(RW_USER) RW_GROUP=$(RW_GROUP) \
35
        PUBLIC_DIR=$(PUBLIC_DIR) PRIVATE_DIR=$(PRIVATE_DIR) \
36
        PUBLIC_FILE=$(PUBLIC_FILE) PRIVATE_FILE=$(PRIVATE_FILE) \
37
        PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
38
-       BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
23 magnus 39
+       BIN_DIR=$(BROOT)$(BIN_DIR) INSTALL=$(INSTALL) \
3 magnus 40
        ./install.sh
41
-       if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
23 magnus 42
+#      if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
43
        if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
44
        if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
3 magnus 45
-       if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
46
-       if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
23 magnus 47
+       if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi
48
+       if [ ! -f $(BROOT)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi
3 magnus 49
 
50
 redhat-install-init.d:
51
        install -D -o root -g root -m 755 \
12 magnus 52
--- a/files/install.sh
53
+++ b/files/install.sh
3 magnus 54
@@ -4,77 +4,6 @@
55
 
56
 PATH=/bin:/sbin/:/usr/bin:/usr/sbin
57
 
58
-error=0
59
-
60
-if [ "x$PREFIX" = "x" ]; then
61
-    echo 'PREFIX not defined'
62
-    error=1
63
-fi
64
-
65
-if [ "x$VAR_PREFIX" = "x" ]; then
66
-    echo 'VAR_PREFIX not defined'
67
-    error=1
68
-fi
69
-
70
-if [ "x$RO_USER" = "x" ]; then
71
-    echo 'RO_USER not defined'
72
-    error=1
73
-fi
74
-
75
-if [ "x$RO_GROUP" = "x" ]; then
76
-    echo 'RO_GROUP not defined'
77
-    error=1
78
-fi
79
-
80
-if [ "x$RW_USER" = "x" ]; then
81
-    echo 'RW_USER not defined'
82
-    error=1
83
-fi
84
-
85
-if [ "x$RW_GROUP" = "x" ]; then
86
-    echo 'RW_GROUP not defined'
87
-    error=1
88
-fi
89
-
90
-if [ "x$PUBLIC_DIR" = "x" ]; then
91
-    echo 'PUBLIC_DIR not defined'
92
-    error=1
93
-fi
94
-
95
-if [ "x$PRIVATE_DIR" = "x" ]; then
96
-    echo 'PRIVATE_DIR not defined'
97
-    error=1
98
-fi
99
-
100
-if [ "x$BIN_DIR" = "x" ]; then
101
-    echo 'BIN_DIR not defined'
102
-    error=1
103
-fi
104
-
105
-if [ $error != 0 ]; then
106
-    exit 1
107
-fi
108
-
109
-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
110
-    ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
111
-fi
112
-
113
-if [ ! -d ${PREFIX} ]; then
114
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
115
-fi
116
-
117
-if [ ! -d ${PREFIX}/etc ]; then
118
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
119
-fi
120
-
121
-if [ ! -d ${PREFIX}/certs ]; then
122
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
123
-fi
124
-
125
-if [ ! -d ${BIN_DIR} ]; then
5 magnus 126
-    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
3 magnus 127
-fi
128
-
35 magnus 129
 for i in icons static
3 magnus 130
 do
131
     if [ -d "${PREFIX}/${i}" ]; then
12 magnus 132
--- a/files/etc/prayer.cf.SRC
133
+++ b/files/etc/prayer.cf.SRC
5 magnus 134
@@ -20,7 +20,7 @@ var_prefix  = "__VAR_PREFIX__"
3 magnus 135
 # User ID to run as if we start off as root
136
 prayer_user           = "prayer"
137
 # Group ID to run as if we start off as root
138
-prayer_group          = "prayer"
139
+prayer_group          = "nogroup"
140
 
141
 # Run prayer as background process.
142
 #   TRUE => will return as soon as valid configuration is found.
35 magnus 143
@@ -271,11 +271,11 @@ http_icon_embed   = TRUE
3 magnus 144
 
35 magnus 145
 # Locatation of SSL certificate file (only used if SSL ports defined).
146
 # Required if we are going to provide SSL services.
147
-ssl_cert_file       = "$prefix/certs/prayer.pem"
148
+ssl_cert_file       = "/etc/ssl/certs/ssl-cert-snakeoil.pem"
149
 
150
 # Locatation of SSL private key file (only used if SSL ports defined).
151
 # Required if we are going to provide SSL services.
152
-ssl_privatekey_file = "$prefix/certs/prayer.pem"
153
+ssl_privatekey_file = "/etc/ssl/private/ssl-cert-snakeoil.key"
154
 
155
 # Master server will regenerate shared RSA key at this interval:
156
 ssl_rsakey_lifespan = 15m
157
@@ -283,26 +283,14 @@ ssl_rsakey_lifespan = 15m
158
 # RSA key remains fresh in child process for this long after first actual use.
159
 ssl_rsakey_freshen  = 15m
160
 
161
-# SSL session cache timeout.
162
-ssl_session_timeout = 24h
163
+# SSL session cache timeout. Uncomment to enable SSL session caching.
164
+# You should also arrange for prayer-ssl-prune to be run periodically.
165
+#ssl_session_timeout = 24h
166
 
167
 # EGD socket, if system has no /dev/urandom
168
 #egd_socket = "/var/prngd/urandom"
169
 
170
 ######################################################################
171
-
172
-# Direct connection stuff. Experimental! Leave this well alone unless you
173
-# understand what it is for (DESIGN document provides detail for the curious).
174
-direct_enable       = FALSE
175
-
176
-# Following four options just define a set of (non-overlapping) ports for
177
-# SSL and plaintext use if direct connection mode is enabled.
178
-direct_ssl_first    = 5000
179
-direct_ssl_count    = 1000
180
-direct_plain_first  = 4000
181
-direct_plain_count  = 1000
182
-
183
-######################################################################
184
 # Session specific configuration
185
 
186
 # Session switches to idle mode after this much time: connections to IMAP
187
@@ -387,13 +375,13 @@ ispell_path         = /usr/bin/ispell
188
 #  <login_suffix_path>
189
 
190
 # Login page prefix
191
-#login_prefix_path   = "$prefix/etc/login_prefix.html"
192
+#login_prefix_path   = "/etc/login_prefix.html"
193
 
194
 # Message of the day file
195
-#motd_path           = "$prefix/etc/motd.html"
196
+#motd_path           = "/etc/motd.html"
197
 
198
 # Login page suffix
199
-#login_suffix_path   = "$prefix/etc/login_suffix.html"
200
+#login_suffix_path   = "/etc/login_suffix.html"
201
 
202
 # Login security: Prayer's front page defaults to a login form.
203
 # If the user does not connect via SSL then this can be changed
204
@@ -431,10 +419,7 @@ bin_dir             = "__BIN_DIR__"
205
 
3 magnus 206
 # Various directories used by the running system
207
 # Logs stored in $log_dir
208
-log_dir             = "$var_prefix/logs"
209
+log_dir             = "/var/log/prayer"
35 magnus 210
-
211
-# $lock_dir used for interlocking between prayer processes
3 magnus 212
-lock_dir            = "$var_prefix/locks"
213
 
214
 # $socket_dir is location for unix domain sockets which connect frontend
215
 # to backend in proxy mode of operation.
35 magnus 216
@@ -442,7 +427,7 @@ socket_dir          = "$var_prefix/socke
3 magnus 217
 
218
 # Split socket directory into 64 subdirs keyed on first letter of sessionID
219
 # Code provides compatibility in both directions: can switch back and forward
23 magnus 220
-socket_split_dir    = TRUE
221
+socket_split_dir    = FALSE
3 magnus 222
 
23 magnus 223
 # Name of Unix domain socket (in $socket_dir) used for initial handshake
224
 # between prayer and prayer-session processes when a user logs in
35 magnus 225
@@ -453,10 +438,10 @@ ssl_session_dir     = "$var_prefix/ssl_s
3 magnus 226
 
227
 # Location for temporary files e.g; attachments and folders in transist
228
 # during upload and download operation. Core files also end up here
229
-tmp_dir             = "$var_prefix/tmp"
230
+tmp_dir             = "/tmp"
231
 
232
 # Location for PID files for prayer and prayer-session master processes.
233
-pid_dir             = "$var_prefix/pid"
23 magnus 234
+pid_dir             = "$var_prefix"
3 magnus 235
 
236
 # Interface to Hermes finger database
237
 #lookup_rpasswd   = "/data/finger/rpasswd.cdb"
35 magnus 238
@@ -617,14 +602,14 @@ hiersep             = "/"
239
 dualuse             = FALSE
240
 
241
 # Names of postponed_folder and sent_mail_folder, relative to maildir
242
-postponed_folder    = "postponed-msgs"
243
-sent_mail_folder    = "sent-mail"
244
+postponed_folder    = "Drafts"
245
+sent_mail_folder    = "Sent"
246
 
247
 # Default domain for outgoing mail. Defaults to "$hostname".
3 magnus 248
 # default_domain      = "<valid mail domain>"
249
 
250
 # Language for ispell.
251
-ispell_language     = "british"
252
+ispell_language     = "american"
253
 
254
 # Size of small and large compose windows
255
 small_cols          = 80