mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-13 16:32:56 +00:00
Use 'zenith_admin' as superuser name in initdb
This commit is contained in:
@@ -28,6 +28,8 @@ const DEFAULT_LISTEN_ADDR: &str = "127.0.0.1:64000";
|
|||||||
const DEFAULT_GC_HORIZON: u64 = 64 * 1024 * 1024;
|
const DEFAULT_GC_HORIZON: u64 = 64 * 1024 * 1024;
|
||||||
const DEFAULT_GC_PERIOD: Duration = Duration::from_secs(100);
|
const DEFAULT_GC_PERIOD: Duration = Duration::from_secs(100);
|
||||||
|
|
||||||
|
const DEFAULT_SUPERUSER: &str = "zenith_admin";
|
||||||
|
|
||||||
/// String arguments that can be declared via CLI or config file
|
/// String arguments that can be declared via CLI or config file
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
struct CfgFileParams {
|
struct CfgFileParams {
|
||||||
@@ -96,6 +98,8 @@ impl CfgFileParams {
|
|||||||
gc_horizon,
|
gc_horizon,
|
||||||
gc_period,
|
gc_period,
|
||||||
|
|
||||||
|
superuser: String::from(DEFAULT_SUPERUSER),
|
||||||
|
|
||||||
workdir: PathBuf::from("."),
|
workdir: PathBuf::from("."),
|
||||||
|
|
||||||
pg_distrib_dir,
|
pg_distrib_dir,
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ pub fn init_repo(conf: &'static PageServerConf, repo_dir: &Path) -> Result<()> {
|
|||||||
let initdb_path = conf.pg_bin_dir().join("initdb");
|
let initdb_path = conf.pg_bin_dir().join("initdb");
|
||||||
let initdb_otput = Command::new(initdb_path)
|
let initdb_otput = Command::new(initdb_path)
|
||||||
.args(&["-D", tmppath.to_str().unwrap()])
|
.args(&["-D", tmppath.to_str().unwrap()])
|
||||||
|
.args(&["-U", &conf.superuser])
|
||||||
.arg("--no-instructions")
|
.arg("--no-instructions")
|
||||||
.env_clear()
|
.env_clear()
|
||||||
.env("LD_LIBRARY_PATH", conf.pg_lib_dir().to_str().unwrap())
|
.env("LD_LIBRARY_PATH", conf.pg_lib_dir().to_str().unwrap())
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ pub struct PageServerConf {
|
|||||||
pub listen_addr: String,
|
pub listen_addr: String,
|
||||||
pub gc_horizon: u64,
|
pub gc_horizon: u64,
|
||||||
pub gc_period: Duration,
|
pub gc_period: Duration,
|
||||||
|
pub superuser: String,
|
||||||
|
|
||||||
// Repository directory, relative to current working directory.
|
// Repository directory, relative to current working directory.
|
||||||
// Normally, the page server changes the current working directory
|
// Normally, the page server changes the current working directory
|
||||||
|
|||||||
@@ -364,6 +364,7 @@ mod tests {
|
|||||||
gc_horizon: 64 * 1024 * 1024,
|
gc_horizon: 64 * 1024 * 1024,
|
||||||
gc_period: Duration::from_secs(10),
|
gc_period: Duration::from_secs(10),
|
||||||
listen_addr: "127.0.0.1:5430".to_string(),
|
listen_addr: "127.0.0.1:5430".to_string(),
|
||||||
|
superuser: "zenith_admin".to_string(),
|
||||||
workdir: repo_dir,
|
workdir: repo_dir,
|
||||||
pg_distrib_dir: "".into(),
|
pg_distrib_dir: "".into(),
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user