github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix loggin dir

Browse Source
This commit is contained in:
Vladimir Stoilov
2024-12-12 16:33:02 +02:00
parent 0997f1ce26
commit fed64e6fbd
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/portmaster-core/main.go
View File

@@ -34,7 +34,7 @@ var (
) )
func init() { func init() {
// Add persisent flags for all commands. // Add persistent flags for all commands.
rootCmd.PersistentFlags().StringVar(&binDir, "bin-dir", "", "set directory for executable binaries (rw/ro)") rootCmd.PersistentFlags().StringVar(&binDir, "bin-dir", "", "set directory for executable binaries (rw/ro)")
rootCmd.PersistentFlags().StringVar(&dataDir, "data-dir", "", "set directory for variable data (rw)") rootCmd.PersistentFlags().StringVar(&dataDir, "data-dir", "", "set directory for variable data (rw)")

2
desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
View File

@@ -27,7 +27,7 @@
!macroend !macroend
!macro NSIS_HOOK_POSTINSTALL !macro NSIS_HOOK_POSTINSTALL
ExecWait 'sc.exe create PortmasterCore binPath= "$INSTDIR\portmaster-core.exe"' ExecWait 'sc.exe create PortmasterCore binPath= "$INSTDIR\portmaster-core.exe --log-dir=%PROGRAMDATA%\Portmaster\logs"'
!macroend !macroend
!macro NSIS_HOOK_PREUNINSTALL !macro NSIS_HOOK_PREUNINSTALL

2
desktop/tauri/src-tauri/templates/service.wxs
View File

@@ -3,7 +3,7 @@
<Fragment> <Fragment>
<CustomAction Id="InstallPortmasterService" <CustomAction Id="InstallPortmasterService"
Directory="INSTALLDIR" Directory="INSTALLDIR"
ExeCommand="sc.exe create PortmasterCore binPath= &quot;[INSTALLDIR]portmaster-core.exe&quot;" ExeCommand="sc.exe create PortmasterCore binPath= &quot;[INSTALLDIR]portmaster-core.exe --log-dir=%PROGRAMDATA%\Portmaster\logs&quot;"
Execute="commit" Execute="commit"
Return="check" Return="check"
Impersonate="no" Impersonate="no"

2
packaging/linux/portmaster.service
View File

@@ -35,7 +35,7 @@ CapabilityBoundingSet=cap_chown cap_kill cap_net_admin cap_net_bind_service cap_
StateDirectory=portmaster StateDirectory=portmaster
# TODO(ppacher): add --disable-software-updates once it's merged and the release process changed. # TODO(ppacher): add --disable-software-updates once it's merged and the release process changed.
WorkingDirectory=/var/lib/portmaster/data WorkingDirectory=/var/lib/portmaster/data
ExecStart=/usr/lib/portmaster/portmaster-core --data /var/lib/portmaster/data -devmode -- $PORTMASTER_ARGS ExecStart=/usr/lib/portmaster/portmaster-core --log-dir=/var/lib/portmaster/log -- $PORTMASTER_ARGS
ExecStopPost=-/usr/lib/portmaster/portmaster-core -recover-iptables ExecStopPost=-/usr/lib/portmaster/portmaster-core -recover-iptables
[Install] [Install]

2
service/core/base/module.go
View File

@@ -25,7 +25,7 @@ func (b *Base) Manager() *mgr.Manager {
// Start starts the module. // Start starts the module.
func (b *Base) Start() error { func (b *Base) Start() error {
startProfiling() startProfiling()
registerLogCleaner() // registerLogCleaner()
return nil return nil
} }