Skip to content

Resolve conflicts and finalize server_manager refactor #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cylae merged 2 commits into from
Jan 26, 2026
Merged

Resolve conflicts and finalize server_manager refactor #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86df49c
Resolve conflicts and finalize server_manager refactor
google-labs-jules[bot] Jan 26, 2026
559f69d
Merge branch 'server-setup-script' into rename-to-server-manager-1161…
Cylae Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions server_manager/src/services/apps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ use super::Service;
use crate::core::hardware::{HardwareInfo, HardwareProfile};
use crate::core::secrets::Secrets;
use std::collections::HashMap;
use anyhow::Result;
use std::process::Command;

pub struct VaultwardenService;
impl Service for VaultwardenService {
Expand Down Expand Up @@ -129,17 +127,6 @@ impl Service for MailService {
"993:993".to_string(),
]
}

fn initialize(&self, _hw: &HardwareInfo, _secrets: &Secrets) -> Result<()> {
let services = vec!["postfix", "exim4", "sendmail"];
for svc in services {
// Stop and disable conflicting system MTA services
let _ = Command::new("systemctl").args(&["stop", svc]).status();
let _ = Command::new("systemctl").args(&["disable", svc]).status();
}
Ok(())
}

fn env_vars(&self, hw: &HardwareInfo, _secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("DMS_DEBUG".to_string(), "0".to_string());
Expand Down
Loading