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

(-)a/alterator.spec (-5 / +3 lines)
Lines 1-6 Link Here
1
Name: alterator
1
Name: alterator
2
Version: 5.3
2
Version: 5.4
3
Release: alt1.qa1
3
Release: alt1
4
4
5
Summary: ALT Linux configurator engine
5
Summary: ALT Linux configurator engine
6
License: GPLv2+
6
License: GPLv2+
Lines 97-103 export LTDL_LIBRARY_PATH=src/libguile-gettext:src/libguile-pipe:%_libdir/guile/% Link Here
97
ln -s ../bin/alterator-cmdline %buildroot%_sbindir/
97
ln -s ../bin/alterator-cmdline %buildroot%_sbindir/
98
98
99
#create special directories
99
#create special directories
100
mkdir -p %buildroot%_runtimedir/alteratord
101
mkdir -p %buildroot%_cachedir/%name
100
mkdir -p %buildroot%_cachedir/%name
102
mkdir -p %buildroot%_localstatedir/%name
101
mkdir -p %buildroot%_localstatedir/%name
103
mkdir -p %buildroot%_sysconfdir/%name
102
mkdir -p %buildroot%_sysconfdir/%name
Lines 115-121 cat >%buildroot%_rpmmacrosdir/%name<<EOF Link Here
115
EOF
114
EOF
116
115
117
cat >%buildroot%_tmpfilesdir/%name.conf<<EOF
116
cat >%buildroot%_tmpfilesdir/%name.conf<<EOF
118
d /var/run/alteratord 0710 root _alteratord -
117
d /run/alteratord 0710 root _alteratord -
119
EOF
118
EOF
120
119
121
%pre
120
%pre
Lines 153-159 EOF Link Here
153
%_sbindir/*
152
%_sbindir/*
154
%_initdir/*
153
%_initdir/*
155
%_mandir/man?/*
154
%_mandir/man?/*
156
%attr(710,root,_alteratord) %dir /var/run/alteratord
157
155
158
%_unitdir/alteratord.service
156
%_unitdir/alteratord.service
159
%_unitdir/alteratord.socket
157
%_unitdir/alteratord.socket
160
158
(-)a/alterator/alteratord.init (-3 / +3 lines)
Lines 7-21 Link Here
7
# processname: alteratord
7
# processname: alteratord
8
# config: /etc/alterator
8
# config: /etc/alterator
9
# description: system configurator
9
# description: system configurator
10
# pidfile: /var/run/alteratord.pid
10
# pidfile: /run/alteratord.pid
11
11
12
WITHOUT_RC_COMPAT=1
12
WITHOUT_RC_COMPAT=1
13
13
14
# Source function library.
14
# Source function library.
15
. /etc/init.d/functions
15
. /etc/init.d/functions
16
16
17
PIDFILE=/var/run/alteratord.pid
17
PIDFILE=/run/alteratord.pid
18
LOCKFILE=/var/lock/subsys/alteratord
18
LOCKFILE=/run/lock/subsys/alteratord
19
RETVAL=0
19
RETVAL=0
20
20
21
start()
21
start()
(-)a/alterator/interfaces/guile/d.scm (-2 / +2 lines)
Lines 19-31 Link Here
19
19
20
(define *d-user* (passwd:name (getpwuid (getuid))))
20
(define *d-user* (passwd:name (getpwuid (getuid))))
21
21
22
; /var/run/alteratord is also used in installer
22
; /run/alteratord is also used in installer
23
; to bounce the socket between stage3 and stage2;
23
; to bounce the socket between stage3 and stage2;
24
; it's also more secure than predefined /tmp subdir
24
; it's also more secure than predefined /tmp subdir
25
; NB: a copy contained in ../../sbin/alteratord
25
; NB: a copy contained in ../../sbin/alteratord
26
(define *tmpdir*
26
(define *tmpdir*
27
  (if (string=? *d-user* "root")
27
  (if (string=? *d-user* "root")
28
      "/var/run/alteratord"
28
      "/run/alteratord"
29
      (string-append
29
      (string-append
30
       (or (getenv "TMPDIR") "/tmp")
30
       (or (getenv "TMPDIR") "/tmp")
31
       "/alterator")))
31
       "/alterator")))
(-)a/alterator/man/alteratord.8 (-1 / +1 lines)
Lines 77-83 Directory for backends. Link Here
77
\fI/usr/lib/alteratord/control\fR
77
\fI/usr/lib/alteratord/control\fR
78
Helper utility to run \fBalteratord\fR on demand. This program is SUID root and is available to members of \fI_alteratord\fR group only.
78
Helper utility to run \fBalteratord\fR on demand. This program is SUID root and is available to members of \fI_alteratord\fR group only.
79
.TP
79
.TP
80
\fI/var/run/alteratord/.socket\fR
80
\fI/run/alteratord/.socket\fR
81
Local domain socket to communicate with \fBalteratord\fR.
81
Local domain socket to communicate with \fBalteratord\fR.
82
.TP
82
.TP
83
\fI/var/log/alteratord.log\fR
83
\fI/var/log/alteratord.log\fR
(-)a/alterator/sbin/alteratord (-2 / +2 lines)
Lines 52-64 Link Here
52
52
53
(define *d-user* (passwd:name (getpwuid (getuid))))
53
(define *d-user* (passwd:name (getpwuid (getuid))))
54
54
55
; /var/run/alteratord is also used in installer
55
; /run/alteratord is also used in installer
56
; to bounce the socket between stage3 and stage2;
56
; to bounce the socket between stage3 and stage2;
57
; it's also more secure than predefined /tmp subdir
57
; it's also more secure than predefined /tmp subdir
58
; NB: a copy contained in ../interfaces/guile/d.scm
58
; NB: a copy contained in ../interfaces/guile/d.scm
59
(define *tmpdir*
59
(define *tmpdir*
60
  (if (string=? *d-user* "root")
60
  (if (string=? *d-user* "root")
61
    "/var/run/alteratord"
61
    "/run/alteratord"
62
    (string-append
62
    (string-append
63
      (or (getenv "TMPDIR") "/tmp")
63
      (or (getenv "TMPDIR") "/tmp")
64
      "/alterator")))
64
      "/alterator")))
(-)a/alterator/systemd/system/alteratord.socket (-1 / +1 lines)
Lines 3-9 Link Here
3
Description=Alterator backend server (socket)
3
Description=Alterator backend server (socket)
4
4
5
[Socket]
5
[Socket]
6
ListenStream=/var/run/alteratord/.socket
6
ListenStream=/run/alteratord/.socket
7
7
8
[Install]
8
[Install]
9
WantedBy=sockets.target
9
WantedBy=sockets.target

Return to bug 35882