PeachCloud
/
peach-workspace
3
2
Fork 1
Code Issues 17 Pull Requests Projects Releases Wiki Activity

Bump version numbers
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
notplants 2022-05-12 12:53:06 +02:00
parent 8202d4af5f
commit 908d265de6
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -2386,7 +2386,7 @@ dependencies = [
[[package]] [[package]]
name = "peach-config" name = "peach-config"
version = "0.1.24" version = "0.1.25"
dependencies = [ dependencies = [
"clap", "clap",
"env_logger 0.6.2", "env_logger 0.6.2",
@ -2425,7 +2425,7 @@ dependencies = [
[[package]] [[package]]
name = "peach-lib" name = "peach-lib"
version = "1.3.2" version = "1.3.3"
dependencies = [ dependencies = [
"async-std", "async-std",
"chrono", "chrono",

2
peach-config/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "peach-config" name = "peach-config"
version = "0.1.24" version = "0.1.25"
authors = ["Andrew Reid <gnomad@cryptolab.net>", "Max Fowler <max@mfowler.info>"] authors = ["Andrew Reid <gnomad@cryptolab.net>", "Max Fowler <max@mfowler.info>"]
edition = "2018" edition = "2018"
description = "Command line tool for installing, updating and configuring PeachCloud" description = "Command line tool for installing, updating and configuring PeachCloud"

18
peach-config/src/set_permissions.rs
View File

@ -6,9 +6,9 @@ use crate::error::PeachConfigError;
use crate::utils::cmd; use crate::utils::cmd;
lazy_static! { lazy_static! {
pub static ref CONFIGS_DIR: String = get_config_value("PEACH_CONFIG_DIR").expect("Failed to load config value for PEACH_CONFIG_DIR"); pub static ref PEACH_CONFIGDIR: String = get_config_value("PEACH_CONFIGDIR").expect("Failed to load config value for PEACH_CONFIGDIR");
pub static ref PEACH_WEB_DIR: String = "/usr/share/peach-web".to_string(); pub static ref PEACH_WEBDIR: String = get_config_value("PEACH_WEBDIR").expect("Failed to load config value for PEACH_WEBDIR");
pub static ref PEACH_HOME_DIR: String = "/home/peach".to_string(); pub static ref PEACH_HOMEDIR: String = get_config_value("PEACH_HOMEDIR").expect("Failed to load config value for PEACH_HOMEDIR");
} }
/// Utility function to set correct file permissions on the PeachCloud device. /// Utility function to set correct file permissions on the PeachCloud device.
@ -16,12 +16,12 @@ lazy_static! {
/// so this is a useful CLI function for quickly correcting anything that may be out of order. /// so this is a useful CLI function for quickly correcting anything that may be out of order.
pub fn set_permissions() -> Result<(), PeachConfigError> { pub fn set_permissions() -> Result<(), PeachConfigError> {
println!("[ UPDATING FILE PERMISSIONS ON PEACHCLOUD DEVICE ]"); println!("[ UPDATING FILE PERMISSIONS ON PEACHCLOUD DEVICE ]");
cmd(&["chmod", "-R", "u+rwX,g+rwX", &CONFIGS_DIR])?; cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_CONFIGDIR])?;
cmd(&["chown", "-R", "peach:peach", &CONFIGS_DIR])?; cmd(&["chown", "-R", "peach:peach", &PEACH_CONFIGDIR])?;
cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_WEB_DIR])?; cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_WEBDIR])?;
cmd(&["chown", "-R", "peach:peach", &PEACH_WEB_DIR])?; cmd(&["chown", "-R", "peach:peach", &PEACH_WEBDIR])?;
cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_HOME_DIR])?; cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_HOMEDIR])?;
cmd(&["chown", "-R", "peach:peach", &PEACH_HOME_DIR])?; cmd(&["chown", "-R", "peach:peach", &PEACH_HOMEDIR])?;
println!("[ PERMISSIONS SUCCESSFULLY UPDATED ]"); println!("[ PERMISSIONS SUCCESSFULLY UPDATED ]");
Ok(()) Ok(())
} }

2
peach-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "peach-lib" name = "peach-lib"
version = "1.3.2" version = "1.3.3"
authors = ["Andrew Reid <glyph@mycelial.technology>"] authors = ["Andrew Reid <glyph@mycelial.technology>"]
edition = "2018" edition = "2018"

2
peach-lib/src/config_manager.rs
View File

@ -61,6 +61,8 @@ pub fn get_peach_config_defaults() -> HashMap<String, String> {
("TEMPORARY_PASSWORD_HASH", ""), ("TEMPORARY_PASSWORD_HASH", ""),
("GO_SBOT_DATADIR", "/home/peach/.ssb-go"), ("GO_SBOT_DATADIR", "/home/peach/.ssb-go"),
("PEACH_CONFIGDIR", "/var/lib/peachcloud"), ("PEACH_CONFIGDIR", "/var/lib/peachcloud"),
("PEACH_HOMEDIR", "/home/peach"),
("PEACH_WEBDIR", "/usr/share/peach-web"),
]); ]);
// convert HashMap<&str, &str> to HashMap<String, String> and return // convert HashMap<&str, &str> to HashMap<String, String> and return
let pc_defaults: HashMap<String, String> = peach_config_defaults let pc_defaults: HashMap<String, String> = peach_config_defaults