diff options
author | Dmitry Bogatov <KAction@gnu.org> | 2017-03-02 12:58:55 +0300 |
---|---|---|
committer | Dmitry Bogatov <KAction@gnu.org> | 2017-03-02 12:58:55 +0300 |
commit | d55b74edb508e4795b4a4e511e92089f3af2fad4 (patch) | |
tree | 8afbd6555a9594dd5c5d5e41565655c12e7de55c /dh_runit | |
parent | fb23e1628d4951088c8a2ae8447f6b0dca4ede34 (diff) |
Remove 'logdir' option for simplicity sake. Strictly speaking it is backward-incompatible change, hence the version major bump, but I am unaware of any actual users of this option.
Diffstat (limited to 'dh_runit')
-rwxr-xr-x | dh_runit | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -16,7 +16,6 @@ sub parse_options($opts) { | |||
16 | when (/^disable$/) { $conf->{enable} = 0; }; | 16 | when (/^disable$/) { $conf->{enable} = 0; }; |
17 | when (/^name=(.*)$/) { $conf->{name} = $1; }; | 17 | when (/^name=(.*)$/) { $conf->{name} = $1; }; |
18 | when (/^logscript$/) { $conf->{logscript} = 1}; | 18 | when (/^logscript$/) { $conf->{logscript} = 1}; |
19 | when (/^logdir=(.*)$/) { $conf->{logdir} = $1 }; | ||
20 | when (/^defaults$/) { "do nothing"; }; | 19 | when (/^defaults$/) { "do nothing"; }; |
21 | default { error("unknown option `$opt'"); } | 20 | default { error("unknown option `$opt'"); } |
22 | } | 21 | } |
@@ -79,7 +78,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) { | |||
79 | } | 78 | } |
80 | runit_autoscript($pkg, 'postrm', "s/#NAME#/$name/"); | 79 | runit_autoscript($pkg, 'postrm', "s/#NAME#/$name/"); |
81 | if ($conf->{logscript}) { | 80 | if ($conf->{logscript}) { |
82 | my $logdir = $conf->{logdir} || "/var/log/runit/$name"; | 81 | my $logdir = "/var/log/runit/$name"; |
83 | 82 | ||
84 | install_dir("$sv_dir/$name/log"); | 83 | install_dir("$sv_dir/$name/log"); |
85 | install_dir($tmp . $logdir); | 84 | install_dir($tmp . $logdir); |
@@ -158,11 +157,6 @@ is error, following are supported: | |||
158 | rights of dedicated user. It is error, if first argument in pair | 157 | rights of dedicated user. It is error, if first argument in pair |
159 | is directory, which already contains F</log/run> script. | 158 | is directory, which already contains F</log/run> script. |
160 | 159 | ||
161 | =item I<logdir>=/path/to/log/directory | ||
162 | |||
163 | This option is meaningful only with I<logscript>. It allows | ||
164 | overriding default log directory F</var/log/runit/I<name>>. | ||
165 | |||
166 | =item I<defaults> | 160 | =item I<defaults> |
167 | 161 | ||
168 | If you need no other options, put this one. | 162 | If you need no other options, put this one. |