starting work on system wide services

Author: Kyagara

README.md

@@ -28,6 +28,9 @@ Reimplementation of features already in the main branch:
 
 Planned:
 
+- Flag in main to always confirm prompts.
+- Maybe add environment variable for the main crescent directory, retrieving the user's home directory while in root returns "/root".
+- Fix some commands not erroring when failing to send commands to a system service.
 - Save information about the service in a file inside the service folder.
 - Add more arguments/commands to `log`, commands to manage the logs for that service for example.
 - Add `delete` service/profile command.

src/commands/new.rs

@@ -95,6 +95,7 @@ impl NewArgs {
         }
 
         let exec_cmd = self.format_exec_cmd(&exec_path);
+        let user_service = Crescent::parse().user_service;
 
         util::println_field_value("Service name", &name);
         util::println_field_value("Profile", self.profile.clone().unwrap_or_default());
@@ -106,18 +107,28 @@ impl NewArgs {
         init_system.get_scripts_paths().iter().for_each(|path| {
             println!("{path}");
         });
-        util::println_field_value("System wide:", Crescent::parse().system_wide);
+        util::println_field_value("System wide:", user_service);
 
         util::confirm("Create this service?")?;
 
-        init_system.create(&exec_cmd)?;
-        eprintln!("Service '{name}' created");
+        // To write system wide files we need to be root.
+        if let Err(err) = init_system.create(&exec_cmd) {
+            if !user_service && err.to_string().contains("Permission denied") {
+                return Err(anyhow!("You must be root to create system wide services."));
+            }
+        }
 
         init_system.reload()?;
 
+        let event = if user_service { "user login" } else { "boot" };
+        let question = format!("Enable this service to start on {event}?");
+        if util::confirm(&question).is_ok() {
+            eprintln!("Enabling '{name}'");
+            init_system.enable()?;
+        }
+
         eprintln!("Starting '{name}'");
         init_system.start()?;
-        println!("Service '{name}' started");
         Ok(())
     }
 
@@ -132,7 +143,10 @@ impl NewArgs {
         let name = name.to_lowercase();
 
         if name.len() > 16 {
-            return Err(anyhow!("Name is too long. Max length is 16 characters."));
+            return Err(anyhow!(
+                "Name is too long. Max length is 16 characters: {}",
+                name
+            ));
         }
 
         let valid_chars = ['_', '-', '.'];

src/init_systems/systemd.rs

@@ -29,7 +29,8 @@ pub struct Systemd {
     service_name: String,
     /// `cres.<name>.socket`
     socket_name: String,
-    system_wide: bool,
+    /// Use the user's service directory instead of the system's, requires root if false.
+    user_service: bool,
 }
 
 impl Systemd {
@@ -40,14 +41,17 @@ impl Systemd {
             name: name.to_string(),
             service_name: format!("cres.{name}.service"),
             socket_name: format!("cres.{name}.socket"),
-            system_wide: Crescent::parse().system_wide,
+            user_service: Crescent::parse().user_service,
         }
     }
 
-    /// Run a `systemctl` command as the user.
-    fn run_command(&self, args: Vec<&str>) -> Result<Output> {
+    /// Run a `systemctl` command.
+    fn run_command(&self, mut args: Vec<&str>) -> Result<Output> {
+        if self.user_service {
+            args.push("--user");
+        }
+
         Ok(Command::new("systemctl")
-            .arg("--user")
             .arg("--no-pager")
             .args(args)
             .output()?)
@@ -57,6 +61,10 @@ impl Systemd {
         let requires = format!("Requires={}", self.socket_name);
         let after = format!("After=network.target {}", self.socket_name);
         let exec_start = format!("ExecStart={cmd}");
+        let wanted_by = match self.user_service {
+            true => "WantedBy=default.target",
+            false => "WantedBy=multi-user.target",
+        };
 
         let service = [
             "[Unit]",
@@ -71,13 +79,10 @@ impl Systemd {
             "StandardError=journal",
             "",
             "[Install]",
-            "WantedBy=default.target",
+            wanted_by,
             "",
         ];
 
-        if let Some(parent) = path.parent() {
-            fs::create_dir_all(parent)?;
-        }
         fs::write(path, service.join("\n"))?;
         Ok(())
     }
@@ -94,9 +99,6 @@ impl Systemd {
             "",
         ];
 
-        if let Some(parent) = path.parent() {
-            fs::create_dir_all(parent)?;
-        }
         fs::write(path, socket.join("\n"))?;
         Ok(())
     }
@@ -110,15 +112,15 @@ impl InitSystem for Systemd {
     }
 
     fn get_scripts_paths(&self) -> Vec<String> {
-        if self.system_wide {
+        if self.user_service {
             vec![
-                SYSTEM_DIR.to_string() + &self.service_name,
-                SYSTEM_DIR.to_string() + &self.socket_name,
+                USER_DIR.to_string() + &self.service_name,
+                USER_DIR.to_string() + &self.socket_name,
             ]
         } else {
             vec![
-                USER_DIR.to_string() + &self.service_name,
-                USER_DIR.to_string() + &self.socket_name,
+                SYSTEM_DIR.to_string() + &self.service_name,
+                SYSTEM_DIR.to_string() + &self.socket_name,
             ]
         }
     }
@@ -143,8 +145,11 @@ impl InitSystem for Systemd {
     }
 
     fn create(&self, cmd: &str) -> Result<()> {
-        let path_str =
-            env::var("HOME").expect("Error retrieving HOME directory.") + "/.config/systemd/user/";
+        let path_str = match self.user_service {
+            true => USER_DIR.to_string(),
+            false => SYSTEM_DIR.to_string(),
+        };
+
         let path = PathBuf::from(path_str);
 
         eprintln!("Writing '{}' unit", self.service_name);
@@ -265,12 +270,12 @@ impl InitSystem for Systemd {
     }
 
     fn list(&self) -> Result<Vec<String>> {
-        let output = self.run_command(vec!["list-unit-files"])?;
+        let output = self.run_command(vec!["list-unit-files", "cres.*.service"])?;
         let out = String::from_utf8(output.stdout)?;
         let output_lines = out.lines().collect::<Vec<&str>>();
         let names: Vec<String> = output_lines
             .iter()
-            .filter(|line| line.contains("cres.") && line.contains(".service"))
+            .filter(|line| line.starts_with("cres."))
             .map(|s| s.split_whitespace().next().unwrap_or("").to_string())
             .collect();
         Ok(names)

src/loggers/journald.rs

@@ -1,24 +1,32 @@
 use std::process::{Child, Command, Output, Stdio};
 
 use anyhow::Result;
+use clap::Parser;
 
-use crate::logger::Logger;
+use crate::{logger::Logger, Crescent};
 
 /// `journald` implementation.
 pub struct Journald {
     service_name: String,
+    user_service: bool,
 }
 
 impl Journald {
     pub fn new(service_name: &str) -> Self {
         let service_name = format!("cres.{}.service", service_name);
-        Self { service_name }
+        Self {
+            service_name,
+            user_service: Crescent::parse().user_service,
+        }
     }
 
     /// Run a `journald` command as the user.
-    fn run_command(&self, args: Vec<&str>) -> Result<Output> {
+    fn run_command(&self, mut args: Vec<&str>) -> Result<Output> {
+        if self.user_service {
+            args.push("--user");
+        }
+
         Ok(Command::new("journalctl")
-            .arg("--user")
             .arg("--unit")
             .arg(&self.service_name)
             .arg("--no-pager")
@@ -35,13 +43,20 @@ impl Logger for Journald {
     }
 
     fn follow(&self) -> Result<Child> {
+        let mut args = vec![
+            "--unit",
+            &self.service_name,
+            "--no-pager",
+            "--follow",
+            "--lines=200",
+        ];
+
+        if self.user_service {
+            args.push("--user");
+        }
+
         Ok(Command::new("journalctl")
-            .arg("--user")
-            .arg("--unit")
-            .arg(&self.service_name)
-            .arg("--no-pager")
-            .arg("--follow")
-            .arg("--lines=200")
+            .args(args)
             .stdout(Stdio::piped())
             .spawn()?)
     }

src/main.rs

@@ -61,10 +61,9 @@ struct Crescent {
         help = "Talk to the init and logging systems of the current user instead of the system",
         short = 'u',
         long = "user",
-        global = true,
-        action = clap::ArgAction::SetFalse
+        global = true
     )]
-    pub system_wide: bool,
+    pub user_service: bool,
 
     #[command(subcommand)]
     pub commands: Commands,