Write auth file in openvpn loop

This commit is contained in:
Quentin McGaw
2020-07-08 22:11:23 +00:00
parent 3ae4523280
commit 765f06e5a8
2 changed files with 11 additions and 9 deletions

View File

@@ -21,10 +21,12 @@ type looper struct {
logger logging.Logger
streamMerger command.StreamMerger
fatalOnError func(err error)
uid int
gid int
}
func NewLooper(conf Configurator, settings settings.OpenVPN, logger logging.Logger,
streamMerger command.StreamMerger, fatalOnError func(err error)) Looper {
streamMerger command.StreamMerger, fatalOnError func(err error), uid, gid int) Looper {
return &looper{
conf: conf,
settings: settings,
@@ -43,6 +45,13 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
}
for {
openvpnCtx, openvpnCancel := context.WithCancel(ctx)
err := l.conf.WriteAuthFile(
l.settings.User,
l.settings.Password,
l.uid,
l.gid,
)
l.fatalOnError(err)
stream, waitFn, err := l.conf.Start(openvpnCtx)
l.fatalOnError(err)
go l.streamMerger.Merge(openvpnCtx, stream,