Skip to content

Commit

Permalink
update to use LAIR_WORKIGN_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
zo-el committed Aug 24, 2024
1 parent a8edaf5 commit 6a58c8d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion crates/hpos_connect_hc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOLOCHAIN_DEFAULT_PASSWORD=<password to unlock holochain conductor>
CORE_HAPP_FILE=<path to a config.json file used for the configure-holochain service>
DEV_UID_OVERRIDE=<network-seed that is used to create new hash spaces with different holo-nixpkgs builds>
LAIR_CONNECTION_URL=<string uri to lcoation of lair keystore> *OPTIONAL*
HOLOCHAIN_WORKING_DIR=<path to holochains working dir> *OPTIONAL is LAIR_CONNECTION_URL is not provided*
LAIR_WORKING_DIR=<path to holochains working dir> *OPTIONAL is LAIR_CONNECTION_URL is not provided*
```
### Example:
Expand Down
9 changes: 3 additions & 6 deletions crates/hpos_connect_hc/src/holo_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,9 @@ fn read_lair_config() -> Result<LairServerConfigInner> {
}

fn default_lair_dir() -> Result<String> {
let working_dir = env::var("HOLOCHAIN_WORKING_DIR")
.context("Failed to read HOLOCHAIN_WORKING_DIR. Is it set in env?")?;
Ok(format!(
"{}/lair-keystore/lair-keystore-config.yaml",
working_dir
))
let working_dir = env::var("LAIR_WORKING_DIR")
.context("Failed to read LAIR_WORKING_DIR. Is it set in env?")?;
Ok(format!("{}/lair-keystore-config.yaml", working_dir))
}

#[derive(Debug, Clone, StructOpt)]
Expand Down
2 changes: 1 addition & 1 deletion crates/hpos_connect_hc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//! // CORE_HAPP_FILE=<path to a config.json file used for the configure-holochain service>
//! // DEV_UID_OVERRIDE=<network-seed that is used to create new hash spaces with different holo-nixpkgs builds>
//! // LAIR_CONNECTION_URL=<string uri to lcoation of lair keystore> *OPTIONAL*
//! // HOLOCHAIN_WORKING_DIR=<path to holochains working dir> *OPTIONAL is LAIR_CONNECTION_URL is not provided*
//! // LAIR_WORKING_DIR=<path to lair-keystore working dir> *OPTIONAL is LAIR_CONNECTION_URL is not provided*
//! ```
//! ### Example:
//!
Expand Down

0 comments on commit 6a58c8d

Please sign in to comment.