mirror of https://github.com/omar-polo/gmid.git
revert aae8f6bf2b
it's just not worth it to inflict this breaking change to the users.
This commit is contained in:
parent
e1e04caa4f
commit
0ac785a6fa
|
@ -2,10 +2,6 @@
|
|||
|
||||
* parse.y (string): retire the deprecated `mime' and `map' config options
|
||||
|
||||
2022-09-08 Omar Polo <op@omarpolo.com>
|
||||
|
||||
* gmid.c (main): change the flags to be consisent with other OpenBSD daemons
|
||||
|
||||
2022-09-07 Omar Polo <op@omarpolo.com>
|
||||
|
||||
* ge.c (main): add `ge': small program to quickly export a directory over Gemini.
|
||||
|
|
|
@ -8,7 +8,7 @@ Wants=network-online.target
|
|||
Type=simple
|
||||
User=gmid
|
||||
Group=nobody
|
||||
ExecStart=/usr/local/bin/gmid -d -f /etc/gmid.conf
|
||||
ExecStart=/usr/local/bin/gmid -f -c /etc/gmid.conf
|
||||
ExecStop=/bin/kill -TERM $MAINPID
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
|
|
17
gmid.8
17
gmid.8
|
@ -20,9 +20,9 @@
|
|||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Bk -words
|
||||
.Op Fl dhnVv
|
||||
.Op Fl fhnVv
|
||||
.Op Fl c Ar config
|
||||
.Op Fl D Ar macro Ns = Ns Ar value
|
||||
.Op Fl f Ar config
|
||||
.Op Fl P Ar pidfile
|
||||
.Ek
|
||||
.Sh DESCRIPTION
|
||||
|
@ -38,6 +38,10 @@ rereads the configuration file when it receives
|
|||
.Pp
|
||||
The options are as follows:
|
||||
.Bl -tag -width 14m
|
||||
.It Fl c Ar config
|
||||
Specifies the configuration file.
|
||||
The default is
|
||||
.Pa /etc/gmid.conf .
|
||||
.It Fl D Ar macro Ns = Ns Ar value
|
||||
Define
|
||||
.Ar macro
|
||||
|
@ -47,13 +51,8 @@ on the command line.
|
|||
Overrides the definition of
|
||||
.Ar macro
|
||||
in the config file if present.
|
||||
.It Fl d
|
||||
Debug mode.
|
||||
Do not daemonize and log to stderr.
|
||||
.It Fl f Ar config
|
||||
Specifies the configuration file.
|
||||
The default is
|
||||
.Pa /etc/gmid.conf .
|
||||
.It Fl f
|
||||
Stays and logs on the foreground.
|
||||
.It Fl h , Fl -help
|
||||
Print the usage and exit.
|
||||
.It Fl n
|
||||
|
|
12
gmid.c
12
gmid.c
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "log.h"
|
||||
|
||||
static const char *opts = "D:df:hnP:Vv";
|
||||
static const char *opts = "c:D:fhnP:Vv";
|
||||
|
||||
static const struct option longopts[] = {
|
||||
{"help", no_argument, NULL, 'h'},
|
||||
|
@ -288,7 +288,7 @@ usage(void)
|
|||
{
|
||||
fprintf(stderr,
|
||||
"Version: " GMID_STRING "\n"
|
||||
"Usage: %s [-dhnVv] [-D macro=value] [-f config] [-P pidfile]\n",
|
||||
"Usage: %s [-fnv] [-c config] [-D macro=value] [-P pidfile]\n",
|
||||
getprogname());
|
||||
}
|
||||
|
||||
|
@ -385,16 +385,16 @@ main(int argc, char **argv)
|
|||
|
||||
while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
|
||||
switch (ch) {
|
||||
case 'c':
|
||||
config_path = absolutify_path(optarg);
|
||||
break;
|
||||
case 'D':
|
||||
if (cmdline_symset(optarg) == -1)
|
||||
fatalx("could not parse macro definition: %s",
|
||||
optarg);
|
||||
break;
|
||||
case 'd':
|
||||
conf.foreground = 1;
|
||||
break;
|
||||
case 'f':
|
||||
config_path = absolutify_path(optarg);
|
||||
conf.foreground = 1;
|
||||
break;
|
||||
case 'h':
|
||||
usage();
|
||||
|
|
|
@ -93,8 +93,8 @@ EOF
|
|||
}
|
||||
|
||||
checkconf() {
|
||||
if ! $gmid -n -f reg.conf >/dev/null 2>&1; then
|
||||
$gmid -n -f reg.conf
|
||||
if ! $gmid -n -c reg.conf >/dev/null 2>&1; then
|
||||
$gmid -n -c reg.conf
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -159,7 +159,7 @@ run() {
|
|||
return
|
||||
fi
|
||||
|
||||
$gmid -P gmid.pid -f reg.conf
|
||||
$gmid -P gmid.pid -c reg.conf
|
||||
|
||||
# give gmid time to bind the port, otherwise we end up
|
||||
# executing gg when gmid isn't ready yet.
|
||||
|
|
Loading…
Reference in New Issue