From a936f929541dfaf9d01fbdd98d361876de9ff3bc Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 16 Jun 2023 13:26:21 -0600
Subject: [PATCH] use postgres user

---
 backend/src/init.rs | 25 +++++++++++++------------
 build/lib/depends   |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/src/init.rs b/backend/src/init.rs
index 92c95b4cc..771f88d84 100644
--- a/backend/src/init.rs
+++ b/backend/src/init.rs
@@ -1,9 +1,7 @@
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 use std::fs::Permissions;
-use std::net::SocketAddr;
 use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
-use std::process::Stdio;
 use std::time::Duration;
 
 use color_eyre::eyre::eyre;
@@ -16,7 +14,7 @@ use tokio::process::Command;
 
 use crate::account::AccountInfo;
 use crate::context::rpc::RpcContextConfig;
-use crate::db::model::{IpInfo, ServerInfo, ServerStatus};
+use crate::db::model::{ServerInfo, ServerStatus};
 use crate::disk::mount::util::unmount;
 use crate::install::PKG_ARCHIVE_DIR;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
@@ -96,6 +94,12 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
             .invoke(crate::ErrorKind::Filesystem)
             .await?;
     }
+    Command::new("chown")
+        .arg("-R")
+        .arg("postgres")
+        .arg(&db_dir)
+        .invoke(crate::ErrorKind::Database)
+        .await?;
 
     let mut pg_paths = tokio::fs::read_dir("/usr/lib/postgresql").await?;
     let mut pg_version = None;
@@ -134,7 +138,10 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
                     .arg(&tmp_dir)
                     .invoke(crate::ErrorKind::Filesystem)
                     .await?;
-                Command::new(format!("/usr/lib/postgresql/{pg_version}/bin/pg_upgrade"))
+                Command::new("sudo")
+                    .arg("-u")
+                    .arg("postgres")
+                    .arg(format!("/usr/lib/postgresql/{pg_version}/bin/pg_upgrade"))
                     .arg(format!(
                         "--old-bindir=/usr/lib/postgresql/{old_version}/bin"
                     ))
@@ -154,15 +161,9 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
 
     crate::disk::mount::util::bind(&db_dir, "/var/lib/postgresql", false).await?;
 
-    Command::new("chown")
-        .arg("-R")
-        .arg("postgres")
-        .arg("/var/lib/postgresql")
-        .invoke(crate::ErrorKind::Database)
-        .await?;
     Command::new("systemctl")
         .arg("start")
-        .arg("postgresql")
+        .arg(format!("postgresql@{pg_version}-main.service"))
         .invoke(crate::ErrorKind::Database)
         .await?;
     if !exists {
diff --git a/build/lib/depends b/build/lib/depends
index 7d4a33d9c..5b57dcf52 100644
--- a/build/lib/depends
+++ b/build/lib/depends
@@ -32,13 +32,13 @@ nvme-cli
 nyx
 openssh-server
 postgresql
-postgresql-13
 psmisc
 rsync
 samba-common-bin
 smartmontools
 sqlite3
 squashfs-tools
+sudo
 systemd
 systemd-resolved
 systemd-sysv