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 | |
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.
-rw-r--r-- | debian/changelog | 5 | ||||
-rwxr-xr-x | dh_runit | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index b55583b..1bd9759 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,10 +1,13 @@ | |||
1 | dh-runit (1.6.3) UNRELEASED; urgency=medium | 1 | dh-runit (2.7) UNRELEASED; urgency=medium |
2 | 2 | ||
3 | * Change naming of generated system users for logging to start | 3 | * Change naming of generated system users for logging to start |
4 | with underscore. | 4 | with underscore. |
5 | * Add missing dependency on dh-sysuser. | 5 | * Add missing dependency on dh-sysuser. |
6 | * Improve readability of code, generating /etc/sv/<daemon>/log/run | 6 | * Improve readability of code, generating /etc/sv/<daemon>/log/run |
7 | script using here-doc notation. | 7 | script using here-doc notation. |
8 | * Remove 'logdir' option for simplicity sake. Strictly speaking it is | ||
9 | backward-incompatible change, hence the version major bump, but I am | ||
10 | unaware of any actual users of this option. | ||
8 | 11 | ||
9 | -- Dmitry Bogatov <KAction@gnu.org> Wed, 01 Mar 2017 18:38:17 +0300 | 12 | -- Dmitry Bogatov <KAction@gnu.org> Wed, 01 Mar 2017 18:38:17 +0300 |
10 | 13 | ||
@@ -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. |