From 7568eac43562159c68f8f1c4b96d72941760e5d7 Mon Sep 17 00:00:00 2001 From: mrdrivingduck Date: Thu, 16 Jan 2025 10:25:18 +0800 Subject: [PATCH] feat: add polardb.conf.sample into packages --- polar-doc/docs/deploying/db-pfs.md | 4 ++-- polar-doc/docs/zh/deploying/db-pfs.md | 4 ++-- src/backend/Makefile | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/polar-doc/docs/deploying/db-pfs.md b/polar-doc/docs/deploying/db-pfs.md index ecbded24639..4e3fa32c45c 100644 --- a/polar-doc/docs/deploying/db-pfs.md +++ b/polar-doc/docs/deploying/db-pfs.md @@ -28,7 +28,7 @@ sudo pfs -C disk mkdir /nvme1n1/shared_data # 初始化 Primary 节点的本地目录和共享目录 sudo polar-initdb.sh $HOME/primary/ /nvme1n1/shared_data/ primary # 注入配置模板 -cat /u01/polardb_pg/share/polardb.conf.sample >> $HOME/primary/postgresql.conf +cat /u01/polardb_pg/share/postgresql/polardb.conf.sample >> $HOME/primary/postgresql.conf ``` 编辑 Primary 节点的配置文件 `~/primary/postgresql.conf`,增加配置项: @@ -89,7 +89,7 @@ initdb -D /tmp/replica1 cp /tmp/replica1/*.conf $HOME/replica1/ # 注入配置模板 -cat /u01/polardb_pg/share/polardb.conf.sample >> $HOME/replica1/postgresql.conf +cat /u01/polardb_pg/share/postgresql/polardb.conf.sample >> $HOME/replica1/postgresql.conf ``` 编辑 Replica 节点的配置文件 `~/replica1/postgresql.conf`,增加配置项: diff --git a/polar-doc/docs/zh/deploying/db-pfs.md b/polar-doc/docs/zh/deploying/db-pfs.md index ecbded24639..4e3fa32c45c 100644 --- a/polar-doc/docs/zh/deploying/db-pfs.md +++ b/polar-doc/docs/zh/deploying/db-pfs.md @@ -28,7 +28,7 @@ sudo pfs -C disk mkdir /nvme1n1/shared_data # 初始化 Primary 节点的本地目录和共享目录 sudo polar-initdb.sh $HOME/primary/ /nvme1n1/shared_data/ primary # 注入配置模板 -cat /u01/polardb_pg/share/polardb.conf.sample >> $HOME/primary/postgresql.conf +cat /u01/polardb_pg/share/postgresql/polardb.conf.sample >> $HOME/primary/postgresql.conf ``` 编辑 Primary 节点的配置文件 `~/primary/postgresql.conf`,增加配置项: @@ -89,7 +89,7 @@ initdb -D /tmp/replica1 cp /tmp/replica1/*.conf $HOME/replica1/ # 注入配置模板 -cat /u01/polardb_pg/share/polardb.conf.sample >> $HOME/replica1/postgresql.conf +cat /u01/polardb_pg/share/postgresql/polardb.conf.sample >> $HOME/replica1/postgresql.conf ``` 编辑 Replica 节点的配置文件 `~/replica1/postgresql.conf`,增加配置项: diff --git a/src/backend/Makefile b/src/backend/Makefile index 0231841a0fa..44765544766 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -212,6 +212,7 @@ endif $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' + $(INSTALL_DATA) $(srcdir)/utils/misc/polardb.conf.sample '$(DESTDIR)$(datadir)/polardb.conf.sample' ifeq ($(with_llvm), yes) install-bin: install-postgres-bitcode @@ -276,7 +277,8 @@ endif $(MAKE) -C utils uninstall-data rm -f '$(DESTDIR)$(datadir)/pg_hba.conf.sample' \ '$(DESTDIR)$(datadir)/pg_ident.conf.sample' \ - '$(DESTDIR)$(datadir)/postgresql.conf.sample' + '$(DESTDIR)$(datadir)/postgresql.conf.sample' \ + '$(DESTDIR)$(datadir)/polardb.conf.sample' ifeq ($(with_llvm), yes) $(call uninstall_llvm_module,postgres) endif