Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issue where we would attempt to remove ssl directory regardless of whether or not we created it (#664)

Browse Source
This commit is contained in:
Keagan McClelland
2021-10-13 14:34:47 -06:00
committed by Aiden McClelland
parent 516db0a3ba
commit c88bb11107
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appmgr/src/net/nginx.rs
View File

@@ -198,8 +198,20 @@ impl NginxControllerInner {
let available_path = let available_path =
nginx_root.join(format!("sites-available/{}_{}.conf", package, id)); nginx_root.join(format!("sites-available/{}_{}.conf", package, id));
let _ = futures::try_join!( let _ = futures::try_join!(
tokio::fs::remove_dir_all(&package_path).map(|res| res async {
.with_ctx(|_| (ErrorKind::Filesystem, package_path.display().to_string()))), if tokio::fs::metadata(&package_path).await.is_ok() {
tokio::fs::remove_dir_all(&package_path)
.map(|res| {
res.with_ctx(|_| {
(ErrorKind::Filesystem, package_path.display().to_string())
})
})
.await?;
Ok(())
} else {
Ok(())
}
},
tokio::fs::remove_file(&enabled_path).map(|res| res tokio::fs::remove_file(&enabled_path).map(|res| res
.with_ctx(|_| (ErrorKind::Filesystem, enabled_path.display().to_string()))), .with_ctx(|_| (ErrorKind::Filesystem, enabled_path.display().to_string()))),
tokio::fs::remove_file(&available_path).map(|res| res.with_ctx(|_| ( tokio::fs::remove_file(&available_path).map(|res| res.with_ctx(|_| (