Change imports and add permissions for peach-web dir

peach-config/src/change_password.rs

@@ -2,7 +2,6 @@ use crate::error::PeachConfigError;
 use crate::ChangePasswordOpts;
 use peach_lib::password_utils::set_new_password;
 
-
 ///  Utility function to set the admin password for peach-web from the command-line.
 pub fn set_peach_web_password(opts: ChangePasswordOpts) -> Result<(), PeachConfigError> {
     match opts.password {

peach-config/src/main.rs

@@ -2,10 +2,10 @@ mod change_password;
 mod constants;
 mod error;
 mod generate_manifest;
+mod set_permissions;
 mod setup_networking;
 mod setup_peach;
 mod setup_peach_deb;
-mod set_permissions;
 mod update;
 mod utils;
 
@@ -14,12 +14,6 @@ use log::error;
 use serde::{Deserialize, Serialize};
 use structopt::StructOpt;
 
-use crate::change_password::set_peach_web_password;
-use crate::generate_manifest::generate_manifest;
-use crate::setup_peach::setup_peach;
-use crate::update::update;
-use crate::set_permissions::set_permissions;
-
 #[derive(StructOpt, Debug)]
 #[structopt(
     name = "peach-config",
@@ -119,14 +113,14 @@ fn main() {
     if let Some(subcommand) = opt.commands {
         match subcommand {
             PeachConfig::Setup(cfg) => {
-                match setup_peach(cfg.no_input, cfg.default_locale, cfg.i2c, cfg.rtc) {
+                match setup_peach::setup_peach(cfg.no_input, cfg.default_locale, cfg.i2c, cfg.rtc) {
                     Ok(_) => {}
                     Err(err) => {
                         error!("peach-config encountered an error: {}", err)
                     }
                 }
             }
-            PeachConfig::Manifest => match generate_manifest() {
+            PeachConfig::Manifest => match generate_manifest::generate_manifest() {
                 Ok(_) => {}
                 Err(err) => {
                     error!(
@@ -135,22 +129,24 @@ fn main() {
                     )
                 }
             },
-            PeachConfig::Update(opts) => match update(opts) {
+            PeachConfig::Update(opts) => match update::update(opts) {
                 Ok(_) => {}
                 Err(err) => {
                     error!("peach-config encountered an error during update: {}", err)
                 }
             },
-            PeachConfig::ChangePassword(opts) => match set_peach_web_password(opts) {
-                Ok(_) => {}
-                Err(err) => {
-                    error!(
-                        "peach-config encountered an error during password update: {}",
-                        err
-                    )
+            PeachConfig::ChangePassword(opts) => {
+                match change_password::set_peach_web_password(opts) {
+                    Ok(_) => {}
+                    Err(err) => {
+                        error!(
+                            "peach-config encountered an error during password update: {}",
+                            err
+                        )
+                    }
                 }
-            },
-            PeachConfig::SetPermissions => match set_permissions() {
+            }
+            PeachConfig::SetPermissions => match set_permissions::set_permissions() {
                 Ok(_) => {}
                 Err(err) => {
                     error!(
@@ -158,7 +154,7 @@ fn main() {
                         err
                     )
                 }
-            }
+            },
         }
     }
 }

peach-config/src/set_permissions.rs

@@ -4,6 +4,7 @@ use crate::utils::cmd;
 /// All configs are stored in this folder, and should be read/writeable by peach group
 /// so they can be read and written by all PeachCloud services.
 pub const CONFIGS_DIR: &str = "/var/lib/peachcloud";
+pub const PEACH_WEB_DIR: &str = "/usr/share/peach-web";
 
 /// Utility function to set correct file permissions on the PeachCloud device.
 /// Accidentally changing file permissions is a fairly common thing to happen,
@@ -13,6 +14,8 @@ pub fn set_permissions() -> Result<(), PeachConfigError> {
     cmd(&["chmod", "-R", "u+rwX,g+rwX", CONFIGS_DIR])?;
     cmd(&["chown", "-R", "peach", CONFIGS_DIR])?;
     cmd(&["chgrp", "-R", "peach", CONFIGS_DIR])?;
+    cmd(&["chmod", "-R", "u+rwX,g+rwX", PEACH_WEB_DIR])?;
+    cmd(&["chown", "-R", "peach-web:peach", PEACH_WEB_DIR])?;
     println!("[ PERMISSIONS SUCCESSFULLY UPDATED ]");
     Ok(())
 }

peach-config/src/setup_peach.rs

@@ -10,7 +10,6 @@ use crate::update::update_microservices;
 use crate::utils::{cmd, conf, create_group_if_doesnt_exist, does_user_exist, get_output};
 use crate::RtcOption;
 
-
 /// Idempotent setup of PeachCloud device which sets up networking configuration,
 /// configures the peachcloud apt repository, installs system dependencies,
 /// installs microservices, and creates necessary system groups and users.