diff options
author | Dmitry Bogatov <KAction@debian.org> | 2018-12-12 02:24:26 +0000 |
---|---|---|
committer | Dmitry Bogatov <KAction@debian.org> | 2018-12-12 02:24:32 +0000 |
commit | 1432d897faea22299d253b3cfad8c94cd751ed1f (patch) | |
tree | 7fd27a5a65c86dd4c5942fa8c92c00f3e2862977 /dh_runit | |
parent | c870dcaa53988f709b1152221e76992972365fb5 (diff) |
Make auto-generated runscripts invoke svlogd(8) as `runit-log' user.
* Make auto-generated runscripts invoke svlogd(8) as `runit-log' user.
* Impose dependency on (runit >= 2.1.2-20), which provides `runit-log'
user.
Diffstat (limited to 'dh_runit')
-rwxr-xr-x | dh_runit | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -87,23 +87,23 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) { | |||
87 | install_dir($tmp . $logdir); | 87 | install_dir($tmp . $logdir); |
88 | 88 | ||
89 | my $run_log = "$sv_dir/$name/log/run"; | 89 | my $run_log = "$sv_dir/$name/log/run"; |
90 | my $log_user = "_log-". $name; | ||
91 | open(RUN_LOG, ">$run_log") || die $!; | 90 | open(RUN_LOG, ">$run_log") || die $!; |
92 | print RUN_LOG << "HERE"; | 91 | print RUN_LOG << "HERE"; |
93 | #!/bin/sh | 92 | #!/bin/sh |
94 | chown -R '$log_user' '$logdir' | 93 | chown -R runit-log:adm '$logdir' |
95 | exec chpst -u '$log_user' svlogd -tt '$logdir' | 94 | chmod 750 '$logdir' |
95 | chmod u+rw,g+r,o-rwx '$logdir'/* | ||
96 | exec chpst -u runit-log svlogd -tt '$logdir' | ||
96 | HERE | 97 | HERE |
97 | close(RUN_LOG); | 98 | close(RUN_LOG); |
98 | chmod(0755, $run_log); | 99 | chmod(0755, $run_log); |
99 | doit('dh_sysuser', '-p', $pkg, $log_user, 'defaults'); | ||
100 | make_symlink("/etc/sv/$name/log/supervise", | 100 | make_symlink("/etc/sv/$name/log/supervise", |
101 | "/var/lib/runit/log/supervise/$name", $tmp); | 101 | "/var/lib/runit/log/supervise/$name", $tmp); |
102 | install_dir("$tmp/var/lib/runit/log/supervise/$name"); | 102 | install_dir("$tmp/var/lib/runit/log/supervise/$name"); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-7'); | 105 | addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-20~'); |
106 | addsubstvar($pkg, 'misc:Depends', 'runit-helper', '>= 2.7.3'); | 106 | addsubstvar($pkg, 'misc:Depends', 'runit-helper', '>= 2.8.1~'); |
107 | } | 107 | } |
108 | 108 | ||
109 | # PROMISE: DH NOOP WITHOUT runit | 109 | # PROMISE: DH NOOP WITHOUT runit |