Changes to centos support

Author: javuto

Vagrantfile

@@ -18,6 +18,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.cpus = 1
     v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
   end
+  config.vm.define "centos", autostart: false
   targets.each do |name, target|
     box = target["box"]
     config.vm.define name do |build|

deploy/lib.sh

@@ -113,15 +113,13 @@ function configure_nginx() {
   local __enabled="$__nginx/sites-enabled"
 
   if [[ "$DISTRO" == "centos" ]]; then
-    $__available="$__nginx/conf.d"
-    $__enabled="$__nginx/conf.d"
+    __available="$__nginx/conf.d"
+    __enabled="$__nginx/conf.d"
   fi
 
   sudo mkdir -p "$__available"
   sudo mkdir -p "$__enabled"
 
-  if [[ "$DISTRO" == "ubuntu" ]]; then
-    
   cat "$__conf" | sed "s|PUBLIC_PORT|$__pport|g" | sed "s|CER_FILE|$__cert|g" | sed "s|KEY_FILE|$__key|g" | sed "s|DHPARAM_FILE|$__dh|g" | sed "s|PRIVATE_PORT|$__iport|g" | sudo tee "$__available/$__out"
 
   if [[ -f "$__enabled/default" ]]; then
@@ -263,20 +261,21 @@ function install_postgresql10_xenial() {
 
   package "postgresql-$__pgversion"
 
-  configure_postgres "$__pgversion" "$__pgconf"
+  configure_postgres "$__pgconf" "postgresql"
 }
 
 # Create empty DB and username
 #   string  PostgreSQL_db_name
 #   string  PostgreSQL_system_user
 #   string  PostgreSQL_db_user
 #   string  PostgreSQL_db_pass
+#   string  PostgerSQL_psql
 function db_user_postgresql() {
-  local __psql="/usr/lib/postgresql/10/bin/psql"
   local __pgdb=$1
   local __pguser=$2
   local __dbuser=$3
   local __dbpass=$4
+  local __psql=$5
 
   log "Creating user"
   local _dbstatementuser="CREATE USER $__dbuser;"
@@ -327,15 +326,19 @@ function repo_postgres_xenial() {
 
 # Configure PostgreSQL
 #   string  postgres_conf_file_location
+#   string  postgres_service_name
+#   string  postgres_hba_file
 function configure_postgres() {
   local __conf=$1
+  local __service=$2
+  local __hba=$3
 
   log "PostgreSQL permissions"
 
-  sudo cp "$__conf" "/etc/postgresql/10/main/pg_hba.conf"
+  sudo cp "$__conf" "$__hba"
 
-  sudo systemctl restart postgresql
-  sudo systemctl enable postgresql
+  sudo systemctl restart "$__service"
+  sudo systemctl enable "$__service"
 }
 
 # Customize the MOTD in Ubuntu

deploy/osctrl-admin.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Fast and efficient operative system management
+Description=osctrl-admin
 ConditionPathExists=/opt/osctrl
 After=network.target
 
@@ -16,7 +16,7 @@ ExecStart=/opt/osctrl/osctrl-admin
 # make sure log directory exists and owned by syslog
 PermissionsStartOnly=true
 ExecStartPre=/bin/mkdir -p /var/log/osctrl-admin
-ExecStartPre=/bin/chown syslog:adm /var/log/osctrl-admin
+ExecStartPre=/bin/chown osctrl:osctrl /var/log/osctrl-admin
 ExecStartPre=/bin/chmod 755 /var/log/osctrl-admin
 StandardOutput=syslog
 StandardError=syslog

deploy/osctrl-tls.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Fast and efficient operative system management
+Description=osctrl-tls
 ConditionPathExists=/opt/osctrl
 After=network.target
 
@@ -16,7 +16,7 @@ ExecStart=/opt/osctrl/osctrl-tls
 # make sure log directory exists and owned by syslog
 PermissionsStartOnly=true
 ExecStartPre=/bin/mkdir -p /var/log/osctrl-tls
-ExecStartPre=/bin/chown syslog:adm /var/log/osctrl-tls
+ExecStartPre=/bin/chown osctrl:osctrl /var/log/osctrl-tls
 ExecStartPre=/bin/chmod 755 /var/log/osctrl-tls
 StandardOutput=syslog
 StandardError=syslog

deploy/provision.sh

@@ -354,6 +354,7 @@ package gcc
 package make
 package openssl
 package tmux
+package bc
 
 # nginx as TLS termination
 if [[ "$NGINX" == true ]]; then
@@ -408,12 +409,25 @@ fi
 # PostgreSQL - Backend
 if [[ "$DOCKER" == false ]]; then
   if [[ "$POSTGRES" == true ]]; then
-    package postgresql 
-    package postgresql-contrib
-
     POSTGRES_CONF="$SOURCE_PATH/deploy/postgres/pg_hba.conf"
-    configure_postgres "$POSTGRES_CONF"
-    db_user_postgresql "$_DB_NAME" "$_DB_SYSTEM_USER" "$_DB_USER" "$_DB_PASS"
+    if [[ "$DISTRO" == "ubuntu" ]]; then
+      package postgresql 
+      package postgresql-contrib  
+      configure_postgres "$POSTGRES_CONF" "postgresql" 
+      POSTGRES_SERVICE="postgresql"
+      POSTGRES_HBA="/etc/postgresql/10/main/pg_hba.conf"
+      POSTGRES_PSQL="/usr/lib/postgresql/10/bin/psql"
+    elif [[ "$DISTRO" == "centos" ]]; then
+      sudo rpm -Uvh "http://yum.postgresql.org/9.6/redhat/rhel-7-x86_64/pgdg-redhat96-9.6-3.noarch.rpm"
+      package postgresql96-server
+      package postgresql96-contrib
+      sudo /usr/pgsql-9.6/bin/postgresql96-setup initdb
+      POSTGRES_SERVICE="postgresql-9.6"
+      POSTGRES_HBA="/var/lib/pgsql/9.6/data/pg_hba.conf"
+      POSTGRES_PSQL="/usr/pgsql-9.6/bin/psql"
+    fi
+    configure_postgres "$POSTGRES_CONF" "$POSTGRES_SERVICE" "$POSTGRES_HBA" 
+    db_user_postgresql "$_DB_NAME" "$_DB_SYSTEM_USER" "$_DB_USER" "$_DB_PASS" "$POSTGRES_PSQL"
   fi
 fi