View | Details | Raw Unified | Return to bug 23377
Collapse All | Expand All

(-)/usr/share/alterator/interfaces/guile/d.scm.orig (-3 / +11 lines)
Lines 16-30 Link Here
16
             d-wait
16
             d-wait
17
             d))
17
             d))
18
18
19
(define *d-socket* "/var/run/alteratord/.socket")
19
(define *d-user* (passwd:name (getpwuid (getuid))))
20
(define *d-user* "root")
20
(define *tmpdir* (string-append (if (string=? *d-user* "root")
21
(define *d-group* "_alteratord")
21
                                    "/tmp"
22
                                    (or (getenv "TMPDIR") "/tmp"))
23
                                "/alterator"))
24
(define *d-socket* (string-append *tmpdir* "/.socket"))
25
(define *d-group* (if (string=? *d-user* "root")
26
                        "_alteratord"
27
                        *d-user*))
22
(define *d-control* "/etc/rc.d/init.d/alteratord")
28
(define *d-control* "/etc/rc.d/init.d/alteratord")
23
(define *d-process* #f)
29
(define *d-process* #f)
24
(define *d-restart-service* #f)
30
(define *d-restart-service* #f)
25
31
26
(define *null-port* (open-output-file "/dev/null"))
32
(define *null-port* (open-output-file "/dev/null"))
27
33
34
(or (access? *tmpdir* W_OK) (mkdir *tmpdir*))
35
28
;; conversion between text and s-exp
36
;; conversion between text and s-exp
29
37
30
(define (text->scm str)
38
(define (text->scm str)
(-)/usr/sbin/alteratord.orig (-1 / +7 lines)
Lines 50-59 Link Here
50
(and (option-ref options 'help #f) (usage))
50
(and (option-ref options 'help #f) (usage))
51
(and (option-ref options 'debug #f) (turn-on-debugging))
51
(and (option-ref options 'debug #f) (turn-on-debugging))
52
52
53
(define *cuser* (passwd:name (getpwuid (getuid))))
54
(define *tmpdir* (string-append (if (string=? *cuser* "root")
55
                                    "/tmp"
56
                                    (or (getenv "TMPDIR") "/tmp"))
57
                                "/alterator"))
58
53
(if (option-ref options 'local #f)
59
(if (option-ref options 'local #f)
54
    (alterator-init-local)
60
    (alterator-init-local)
55
    (begin (alterator-init-global)
61
    (begin (alterator-init-global)
56
           (prepare-log "/var/log/alteratord.log")))
62
           (prepare-log (string-append *tmpdir* "/alteratord.log"))))
57
63
58
(with-exit-handler
64
(with-exit-handler
59
  (lambda()
65
  (lambda()

Return to bug 23377