diff options
| -rw-r--r-- | dist-assets/linux/mullvad-daemon.service | 2 | ||||
| -rwxr-xr-x | dist-assets/pkg-scripts/postinstall | 4 | ||||
| -rw-r--r-- | mullvad-daemon/src/system_service.rs | 18 |
3 files changed, 1 insertions, 23 deletions
diff --git a/dist-assets/linux/mullvad-daemon.service b/dist-assets/linux/mullvad-daemon.service index 83c3032031..6248e11d33 100644 --- a/dist-assets/linux/mullvad-daemon.service +++ b/dist-assets/linux/mullvad-daemon.service @@ -3,7 +3,7 @@ Description=Mullvad VPN daemon Wants=network.target [Service] -ExecStart="/opt/Mullvad VPN/resources/mullvad-daemon" -v --disable-stdout-timestamps --log /var/log/mullvad-daemon/daemon.log --tunnel-log /var/log/mullvad-daemon/openvpn.log +ExecStart="/opt/Mullvad VPN/resources/mullvad-daemon" -v --disable-stdout-timestamps [Install] WantedBy=multi-user.target diff --git a/dist-assets/pkg-scripts/postinstall b/dist-assets/pkg-scripts/postinstall index c2d3b3f7e1..a56cc90e5c 100755 --- a/dist-assets/pkg-scripts/postinstall +++ b/dist-assets/pkg-scripts/postinstall @@ -24,10 +24,6 @@ DAEMON_PLIST=$(cat <<-EOM <array> <string>$INSTALL_DIR/Mullvad VPN.app/Contents/Resources/mullvad-daemon</string> <string>-v</string> - <string>--log</string> - <string>$LOG_DIR/daemon.log</string> - <string>--tunnel-log</string> - <string>$LOG_DIR/openvpn.log</string> </array> <key>UserName</key> diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs index 91e245e881..e79628a590 100644 --- a/mullvad-daemon/src/system_service.rs +++ b/mullvad-daemon/src/system_service.rs @@ -10,7 +10,6 @@ use std::{env, io, thread}; use cli; use error_chain::ChainedError; -use mullvad_metadata::PRODUCT_NAME; use windows_service::service::{ ServiceAccess, ServiceControl, ServiceControlAccept, ServiceErrorControl, ServiceExitCode, ServiceInfo, ServiceStartType, ServiceState, ServiceStatus, ServiceType, @@ -227,19 +226,6 @@ pub fn install_service() -> Result<()> { } fn get_service_info() -> Result<ServiceInfo> { - let program_data_directory_string = - ::std::env::var_os("ALLUSERSPROFILE").ok_or_else(|| ErrorKind::NoLogDir)?; - let program_data_directory = Path::new(&program_data_directory_string); - let log_directory = program_data_directory.join(PRODUCT_NAME); - let service_log_file = log_directory.join("daemon.log"); - let tunnel_log_file = log_directory.join("openvpn.log"); - - if let Err(error) = fs::create_dir(log_directory) { - if error.kind() != io::ErrorKind::AlreadyExists { - return Err(error).chain_err(|| ErrorKind::NoLogDir); - } - } - Ok(ServiceInfo { name: OsString::from(SERVICE_NAME), display_name: OsString::from(SERVICE_DISPLAY_NAME), @@ -248,10 +234,6 @@ fn get_service_info() -> Result<ServiceInfo> { error_control: ServiceErrorControl::Normal, executable_path: env::current_exe().unwrap(), launch_arguments: vec![ - OsString::from("--log"), - OsString::from(service_log_file), - OsString::from("--tunnel-log"), - OsString::from(tunnel_log_file), OsString::from("--run-as-service"), OsString::from("-v"), ], |