Dialog to input mysql database server address/name

Author: Danie

configs/database.yml.mysql

@@ -9,7 +9,7 @@ production:
   pool: 5
   username: gitlab
   password: 'gitlab'
-  # host: localhost
+  host: localhost
   # socket: /tmp/mysql.sock
 
 #
@@ -23,6 +23,7 @@ development:
   pool: 5
   username: gitlab
   password: 'gitlab'
+  host: localhost
   # socket: /tmp/mysql.sock
 
 # Warning: The database defined as "test" will be erased and
@@ -36,4 +37,5 @@ test: &test
   pool: 5
   username: gitlab
   password: 'gitlab'
+  host: localhost
   # socket: /tmp/mysql.sock

configs/database.yml.postgresql

@@ -8,7 +8,7 @@ production:
   pool: 5
   username: gitlab
   password: 'gitlab'
-  # host: localhost
+  host: localhost
   # port: 5432 
   # socket: /tmp/postgresql.sock
 
@@ -22,6 +22,7 @@ development:
   pool: 5
   username: gitlab
   password: 'gitlab'
+  host: localhost
   # socket: /tmp/postgresql.sock
 
 #
@@ -34,6 +35,7 @@ staging:
   pool: 5
   username: gitlab
   password: 'gitlab'
+  host: localhost
   # socket: /tmp/postgresql.sock
 
 # Warning: The database defined as "test" will be erased and
@@ -46,4 +48,5 @@ test: &test
   pool: 5
   username: gitlab
   password: 'gitlab'
+  host: localhost
   # socket: /tmp/postgresql.sock

gitlab.postinst

@@ -88,7 +88,8 @@ gitlab_shell_install() {
 #
 gitlab_db_initialize() {
    # determine needed database values
-   DB_ADAPTER=$(dialog --radiolist "Choose Databse-Adapter for GitLab" 0 0 0 "mysql" "MySQL-Database Adapter" on "postgresql" "PostgreSQL-Database Adapter" off 3>&1 1>&2 2>&3 3>&-)
+   DB_ADAPTER=$(dialog --radiolist "Choose Database-Adapter for GitLab" 0 0 0 "mysql" "MySQL-Database Adapter" on "postgresql" "PostgreSQL-Database Adapter" off 3>&1 1>&2 2>&3 3>&-)
+   DB_SERVER=$(dialog --inputbox "Please enter the Database-Servername for GitLab." 0 0 "localhost" 3>&1 1>&2 2>&3 3>&-)
    DB_DATABASE=$(dialog --inputbox "Please enter the Database for GitLab." 0 0 "gitlab" 3>&1 1>&2 2>&3 3>&-)
    DB_USER=$(dialog --inputbox "Please enter the Database-User for GitLab." 0 0 "gitlab" 3>&1 1>&2 2>&3 3>&-)
    DB_PASS=$(dialog --inputbox "Please enter the Database-Password for GitLab." 0 0 "gitlab" 3>&1 1>&2 2>&3 3>&-)
@@ -133,6 +134,7 @@ gitlab_db_initialize() {
    fi
 
    # place values into databse configuration
+   sed -i "s/host: localhost/host: $DB_SERVER/g" /etc/gitlab/database.yml.$DB_ADAPTER
    sed -i "s/database: gitlab/database: $DB_DATABASE/g" /etc/gitlab/database.yml.$DB_ADAPTER
    sed -i "s/username: gitlab/username: $DB_USER/g" /etc/gitlab/database.yml.$DB_ADAPTER
    sed -i "s/password: 'gitlab'/password: '$DB_PASS'/g" /etc/gitlab/database.yml.$DB_ADAPTER