remove hard-coding hostname

Author: Joshua1023

gerrit/run

@@ -73,7 +73,7 @@ run() {
     git config -f review_site/etc/gerrit.config auth.httpHeader REMOTE_USER
     git config -f review_site/etc/gerrit.config auth.httpDisplaynameHeader OIDC_CLAIM_name
     git config -f review_site/etc/gerrit.config auth.httpEmailHeader OIDC_CLAIM_email
-    git config -f review_site/etc/gerrit.config auth.emailFormat "{0}@nsbox.internal"
+    git config -f review_site/etc/gerrit.config auth.emailFormat "{0}@$hostname"
     git config -f review_site/etc/gerrit.config auth.allowRegisterNewEmail false
     git config -f review_site/etc/gerrit.config auth.enableRunAs false
     git config -f review_site/etc/gerrit.config receive.timeout 15min

keycloak/createuser

@@ -6,6 +6,7 @@ set -o pipefail
 
 createuser() {
     local realm="nsbox"
+    local hostname="nsbox.internal"
     local loginDomain="login.nsbox.internal"
 
     # Initialize variables with default or empty values
@@ -15,6 +16,11 @@ createuser() {
 
     while [[ $# -gt 0 ]]; do
         case "$1" in
+            "--hostname")
+                shift
+                hostname="$1"
+                echo "Using hostname $hostname instead of nsbox.internal"
+                ;;
             "--login-domain")
                 shift
                 loginDomain="$1"
@@ -45,7 +51,7 @@ createuser() {
         exit 1
     fi
 
-    local email="$username@nsbox.internal"
+    local email="$username@$hostname"
 
     cd "$HOME"
     export KEYCLOAK_HOME="$HOME/keycloak"

portal/buildbot.go

@@ -346,11 +346,11 @@ func PrepareBuildbotAccountInGerrit() ([]*gerrit.Project, error) {
 	}
 
 	// Ensure the user exists
-	if err := AddGerritUser(username, "Buildbot", "buildbot@nsbox.internal"); err != nil {
+	if err := AddGerritUser(username, "Buildbot", "buildbot@"+*hostname); err != nil {
 		return nil, fmt.Errorf("error ensuring user exists: %w", err)
 	}
 
-	client := gerrit.NewClient("http://"+*bindIP+":8081", "admin", "Administrator", "admin@nsbox.internal")
+	client := gerrit.NewClient("http://"+*bindIP+":8081", "admin", "Administrator", "admin@"+*hostname)
 	if err := client.Login(); err != nil {
 		return nil, fmt.Errorf("error logging into gerrit: %w", err)
 	}
@@ -400,7 +400,7 @@ func StopBuildbot() {
 
 func WatchGerritProjects() {
 	for {
-		client := gerrit.NewClient("http://"+*bindIP+":8081", "admin", "Administrator", "admin@nsbox.internal")
+		client := gerrit.NewClient("http://"+*bindIP+":8081", "admin", "Administrator", "admin@"+*hostname)
 		if err := client.Login(); err != nil {
 			log.Printf("WatchGerritProjects: error logging into gerrit: %v", err)
 			time.Sleep(30 * time.Second)

portal/gerrit.go

@@ -72,7 +72,7 @@ func StartGerrit() error {
 		return err
 	}
 	WaitGerritUp()
-	if err := AddGerritUser("admin", "Administrator", "admin@nsbox.internal"); err != nil {
+	if err := AddGerritUser("admin", "Administrator", "admin@"+*hostname); err != nil {
 		return err
 	}
 	return nil

portal/keycloak.go

@@ -244,6 +244,7 @@ func AddKeycloakUser(username, firstname, lastname string) (string, error) {
 
 	cmd := exec.Command("podman", "exec", "keycloak",
 		"/home/keycloak/createuser",
+		"--hostname", *hostname,
 		"--login-domain", *loginDomain,
 		"--username", username,
 		"--first-name", firstname,

portal/main.go

@@ -221,7 +221,7 @@ func handleCreateUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Add user to Gerrit (idempotent operation)
-	err = AddGerritUser(username, firstName+" "+lastName, username+"@nsbox.internal")
+	err = AddGerritUser(username, firstName+" "+lastName, username+"@"+*hostname)
 	if err != nil {
 		http.Error(w, "Failed to add user to Gerrit: "+err.Error(), http.StatusInternalServerError)
 		return