Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postfix-mta-sts-resolver
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Snawoot
postfix-mta-sts-resolver
Commits
4fc24eef
Unverified
Commit
4fc24eef
authored
2 years ago
by
Snawoot
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #97 from jschauma/master
add command-line options "-g", "-u", "-p"
parents
03bf1ad1
7f9f7914
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
man/mta-sts-daemon.1.adoc
+10
-1
10 additions, 1 deletion
man/mta-sts-daemon.1.adoc
postfix_mta_sts_resolver/daemon.py
+26
-1
26 additions, 1 deletion
postfix_mta_sts_resolver/daemon.py
with
36 additions
and
2 deletions
man/mta-sts-daemon.1.adoc
+
10
−
1
View file @
4fc24eef
...
...
@@ -29,13 +29,22 @@ successful authentication of that site when forwarding mail there.
*-v, --verbosity* _VERBOSITY_::
set log verbosity level: _debug_, _info_ (default), _warn_, _error_, or
_fatal_.
*-c, --config* _FILE_::
config file location (default: _/etc/mta-sts-daemon.yml_)
*-g, --group* _GROUP_::
change eGID to this group (default: _none_)
*-l, --logfile* _FILE_::
log file location (default: _none_)
*-p, --pidfile* _PIDFILE_::
name of the file to write the current pid to (default: _none_)
*-u, --user* _USER_::
change eUID to this user (default: _none_)
*--disable-uvloop*::
do not use uvloop even if it is available (default: enabled if available)
...
...
This diff is collapsed.
Click to expand it.
postfix_mta_sts_resolver/daemon.py
+
26
−
1
View file @
4fc24eef
...
...
@@ -3,8 +3,11 @@
import
os
import
argparse
import
asyncio
import
grp
import
logging
import
pwd
import
signal
import
sys
from
functools
import
partial
from
.asdnotify
import
AsyncSystemdNotifier
...
...
@@ -26,12 +29,18 @@ def parse_args():
help
=
"
config file location
"
,
metavar
=
"
FILE
"
,
default
=
defaults
.
CONFIG_LOCATION
)
parser
.
add_argument
(
"
-g
"
,
"
--group
"
,
help
=
"
change eGID to this group
"
)
parser
.
add_argument
(
"
-l
"
,
"
--logfile
"
,
help
=
"
log file location
"
,
metavar
=
"
FILE
"
)
parser
.
add_argument
(
"
--disable-uvloop
"
,
help
=
"
do not use uvloop even if it is available
"
,
action
=
"
store_true
"
)
parser
.
add_argument
(
"
-p
"
,
"
--pidfile
"
,
help
=
"
name of the file to write the current pid to
"
)
parser
.
add_argument
(
"
-u
"
,
"
--user
"
,
help
=
"
change eUID to this user
"
)
return
parser
.
parse_args
()
...
...
@@ -96,8 +105,24 @@ async def amain(cfg, loop): # pragma: no cover
def
main
():
# pragma: no cover
# Parse command line arguments and setup basic logging
args
=
parse_args
()
if
args
.
pidfile
is
not
None
:
with
open
(
args
.
pidfile
,
'
w
'
)
as
f
:
f
.
write
(
str
(
os
.
getpid
()))
if
args
.
group
is
not
None
:
try
:
g
=
grp
.
getgrnam
(
args
.
group
)
os
.
setegid
(
g
.
gr_gid
)
except
Exception
as
e
:
print
(
"
Unable to change eGID to
'
{}
'
: {}
"
.
format
(
args
.
group
,
e
),
file
=
sys
.
stderr
)
return
os
.
EX_OSERR
if
args
.
user
is
not
None
:
try
:
p
=
pwd
.
getpwnam
(
args
.
user
)
os
.
seteuid
(
p
.
pw_uid
)
except
Exception
as
e
:
print
(
"
Unable to change eUID to
'
{}
'
: {}
"
.
format
(
args
.
user
,
e
),
file
=
sys
.
stderr
)
return
os
.
EX_OSERR
with
utils
.
AsyncLoggingHandler
(
args
.
logfile
)
as
log_handler
:
logger
=
utils
.
setup_logger
(
'
MAIN
'
,
args
.
verbosity
,
log_handler
)
utils
.
setup_logger
(
'
STS
'
,
args
.
verbosity
,
log_handler
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment