1 files changed, 62 insertions, 20 deletions

diff --git a/src/main.rs b/src/main.rs
index 4c528da..7f5bcdc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,6 +21,7 @@ pub(crate) mod images;
 pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod release;
+pub(crate) mod render;
 
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
@@ -65,8 +66,8 @@ enum Action {
     },
     #[command(about = "Start the local development services")]
     Dev {
-        #[arg(long, default_value_t = 8080)]
-        port: u16,
+        #[arg(long)]
+        port: Option<u16>,
     },
     #[command(about = "Start or update services in the selected mode")]
     Up {
@@ -79,6 +80,15 @@ enum Action {
         #[arg(long)]
         online: bool,
     },
+    #[command(
+        about = "Render public Caddy, website, and cgit configuration without starting services"
+    )]
+    Config {
+        #[arg(long)]
+        production: bool,
+        #[arg(long)]
+        port: Option<u16>,
+    },
     #[command(about = "Show service status")]
     Status,
     #[command(about = "Stop services while retaining data")]
@@ -88,8 +98,8 @@ enum Action {
         destination: Option<PathBuf>,
         #[arg(long)]
         include_images: bool,
-        #[arg(long, default_value = archive::RECIPIENT)]
-        recipient: String,
+        #[arg(long)]
+        recipient: Option<String>,
         #[arg(long)]
         key: Option<PathBuf>,
     },
@@ -147,27 +157,17 @@ fn execute(arguments: Cli) -> Result<()> {
         owner_fingerprint,
     } = arguments.command
     {
-        let mut command = project.command("cargo")?;
-        command
-            .args(["run", "--locked", "-p", "stack-chat-server", "--", "--root"])
-            .arg(&project.root);
-        if init {
-            command.arg("--init");
-        }
-        if let Some(fingerprint) = reset_owner {
-            command.arg("--reset-owner").arg(fingerprint);
-        }
-        if owner_fingerprint {
-            command.arg("--owner-fingerprint");
-        }
-        return process::run(&mut command);
+        return chat(&project, init, reset_owner.as_deref(), owner_fingerprint);
     }
+
     let _operation = project.lock()?;
     match arguments.command {
         Action::Dev { port } => {
             let mut settings = project.settings()?;
             settings.mode = Mode::Local;
-            settings.port = port;
+            if let Some(selected_port) = port {
+                settings.port = selected_port;
+            }
             images::prepare(&project, &mut settings)?;
             project.up(&settings)
         }
@@ -193,6 +193,23 @@ fn execute(arguments: Cli) -> Result<()> {
             images::prepare(&project, &mut settings)?;
             project.up(&settings)
         }
+        Action::Config { production, port } => {
+            let mut settings = project.settings()?;
+            settings.mode = if production {
+                Mode::Production
+            } else {
+                Mode::Local
+            };
+            if let Some(selected_port) = port {
+                settings.port = selected_port;
+            }
+            stack_config::initialize_public(&project.root)?;
+            render::prepare(&project, &settings)?;
+            process::line(format_args!(
+                "Public configuration: {}",
+                render::directory(&project, &settings).display()
+            ))
+        }
         Action::Status => project.status(&project.settings()?),
         Action::Down => project.down(&project.settings()?),
         Action::Backup {
@@ -205,11 +222,14 @@ fn execute(arguments: Cli) -> Result<()> {
                 || Ok(project.root.join("var/exports")),
                 |path| absolute(&path),
             )?;
+            let configuration = stack_config::Config::load(&project.root)?;
+            let selected_recipient =
+                recipient.unwrap_or(configuration.value("BACKUP_RECIPIENT")?.to_owned());
             archive::backup(
                 &project,
                 &output,
                 include_images,
-                &recipient,
+                &selected_recipient,
                 key.as_deref(),
             )
         }
@@ -226,6 +246,28 @@ fn execute(arguments: Cli) -> Result<()> {
     }
 }
 
+fn chat(
+    project: &Project,
+    init: bool,
+    reset_owner: Option<&str>,
+    owner_fingerprint: bool,
+) -> Result<()> {
+    let mut command = project.command("cargo")?;
+    command
+        .args(["run", "--locked", "-p", "stack-chat-server", "--", "--root"])
+        .arg(&project.root);
+    if init {
+        command.arg("--init");
+    }
+    if let Some(fingerprint) = reset_owner {
+        command.arg("--reset-owner").arg(fingerprint);
+    }
+    if owner_fingerprint {
+        command.arg("--owner-fingerprint");
+    }
+    process::run(&mut command)
+}
+
 fn absolute(path: &Path) -> Result<PathBuf> {
     Ok(if path.is_absolute() {
         path.to_path_buf()