From 67bf797ccf93e4030b37766016a3d1eb04d40e3a Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 4 Jul 2022 14:20:20 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E5=B0=86repo=E4=BB=93=E5=BA=93=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E5=92=8C=E5=AF=86=E7=A0=81=E4=BB=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=B8=AD=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                   |  4 ++++
 conf/yum-CentOS-7.conf     | 24 ++++++++++++------------
 conf/yum-RockyLinux-8.conf | 24 ++++++++++++------------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 515c6b6e..8f65c0c4 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,10 @@ export LOCK_STATE
 
 all: $(PROFILE_LIST)
 	$(Q) chmod 0755 $(TOOLSDIR)/*
+	$(Q) sed -i -e 's/PULP_REPO_USERNAME/$(PULP_REPO_USERNAME)/g' $(CONFDIR)/yum-RockyLinux-8.conf
+	$(Q) sed -i -e 's/PULP_REPO_PASSWORD/$(PULP_REPO_PASSWORD)/g' $(CONFDIR)/yum-RockyLinux-8.conf
+	$(Q) sed -i -e 's/PULP_REPO_USERNAME/$(PULP_REPO_USERNAME)/g' $(CONFDIR)/yum-CentOS-7.conf
+	$(Q) sed -i -e 's/PULP_REPO_PASSWORD/$(PULP_REPO_PASSWORD)/g' $(CONFDIR)/yum-CentOS-7.conf
 	$(Q) echo "=== Building $< $(OS_RELEASE_VER) ==="
 	$(Q) $(MAKE) -f make/Makefile.$< all
 
diff --git a/conf/yum-CentOS-7.conf b/conf/yum-CentOS-7.conf
index 1f79bb83..2437cfd0 100644
--- a/conf/yum-CentOS-7.conf
+++ b/conf/yum-CentOS-7.conf
@@ -78,45 +78,45 @@ name=framework
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/framework/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [platform]
 name=platform
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/platform/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [protocol]
 name=protocol
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/protocol/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [tsg]
 name=tsg
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/tsg/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [AppSktech]
 name=AppSketch
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/AppSketch/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [tfe]
 name=tfe
 baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/tfe/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
diff --git a/conf/yum-RockyLinux-8.conf b/conf/yum-RockyLinux-8.conf
index bc21e7e0..1545a8b3 100644
--- a/conf/yum-RockyLinux-8.conf
+++ b/conf/yum-RockyLinux-8.conf
@@ -55,45 +55,45 @@ name=framework
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/framework/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [platform]
 name=platform
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/platform/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [protocol]
 name=protocol
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/protocol/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [tsg]
 name=tsg
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/tsg/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [AppSktech]
 name=AppSketch
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/AppSketch/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD
 
 [tfe]
 name=tfe
 baseurl=https://repo.geedge.net/pulp/content/8/x86_64/stable/tfe/
 enabled=1
 gpgcheck=0
-username=tsg-os-installer
-password=vIg1tTu0CHS6UF1f6sRD9e6gxxwNvQCO
+username=PULP_REPO_USERNAME
+password=PULP_REPO_PASSWORD