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

appmgr: wrap up tor

Browse Source
This commit is contained in:
Aiden McClelland
2021-06-24 17:10:30 -06:00
parent d09adb76bd
commit 707a5b1d90
12 changed files with 156 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appmgr/src/install/mod.rs
View File

@@ -331,6 +331,7 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
progress_model.put(&mut db, &progress).await?;
let mut tx = db.begin().await?;
let mut sql_tx = ctx.secret_store.begin().await?;
let mut network = crate::db::DatabaseModel::new()
.network()
@@ -348,7 +349,10 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
log::info!("Install {}@{}: Installed main", pkg_id, version);
log::info!("Install {}@{}: Installing interfaces", pkg_id, version);
let interface_info = manifest.interfaces.install(ip).await?;
let interface_info = manifest
.interfaces
.install(&ctx, &mut sql_tx, pkg_id, ip)
.await?;
log::info!("Install {}@{}: Installed interfaces", pkg_id, version);
log::info!("Install {}@{}: Complete", pkg_id, version);
@@ -461,6 +465,8 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
}
}
ctx.tor_controller.sync(&mut tx, &mut sql_tx).await?;
tx.commit(None).await?;
Ok(())