Fixed issues in the git-update script.

files/opendsa/on_update.sh

@@ -8,7 +8,15 @@
 update_pip_fn=$(cat <<'EOF'
 cd
 python3 -m pip install --user -r OpenDSA/server/requirements.txt
+
+# Initialize the DB if required.
+if [[ ! -f OpenDSA/server/openDSA.db ]]
+then
+    cd OpenDSA/server/
+    ./main.py init_db
+fi
 EOF
+)
 
 # Run PIP as OpenDSA.
 sudo --user opendsa --group opendsa --set-home -- bash -c "$update_pip_fn"

files/update_repo.sh

@@ -90,7 +90,7 @@ then
     if [[ ! -z "$REPO_ON_UPDATE" ]]
     then
 	# Run it if it is there.
-	$REPO_ON_UPDATE
+	eval "$REPO_ON_UPDATE"
     fi
     exit 0
 else

manifests/aes_broker.pp

@@ -22,7 +22,7 @@ class aes::aes_broker {
 
   user { "${broker_user}" :
     ensure => present,
-    home => "${broker_user}",
+    home => "${broker_home}",
     comment => 'Message broker for AES',
     managehome => false,
     membership => inclusive,

manifests/opendsa.pp

@@ -27,12 +27,20 @@ class aes::opendsa {
     ensure => present,
     owner => root,
     group => root,
-    mode  => '0600',
+    mode  => '0700',
     source => "puppet:///modules/${module_name}/opendsa/on_update.sh",
   }
 
+  file { "/etc/systemd/system/${opendsa_service}.service":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode => '0644',
+    source => "puppet:///modules/${module_name}/opendsa/opendsa.service",
+  }
+
   exec { 'update-repo':
-    command => "/opt/utils/update_repo.sh ${opendsa_home}/OpenDSA https://oauth2:taNPRZid9Hv6jJtdW_T8@gitlab.liu.se:opendsa/OpenDSA.git exam",
+    command => "/opt/utils/update_repo.sh ${opendsa_home}/OpenDSA https://oauth2:taNPRZid9Hv6jJtdW_T8@gitlab.liu.se/opendsa/OpenDSA.git exam",
     environment => [ "REPO_USER=${opendsa_user}", "REPO_GROUP=${opendsa_group}", "REPO_ON_UPDATE=${opendsa_home}/on_update.sh" ],
     # This command will need to run "on_update" as root in order to restart the service.
     user => root,
@@ -48,20 +56,15 @@ class aes::opendsa {
     source => "puppet:///modules/${module_name}/opendsa/manage.sh",
   }
 
-  exec { "${opendsa_home}/OpenDSA/server/main.py init_db" : 
-    cwd => "${opendsa_home}/OpenDSA/server/",
-    creates => "${opendsa_home}/OpenDSA/server/openDSA.db",
-    user => "${opendsa_user}",
-    group => "${opendsa_group}",
+  # Temporary!
+  file { '/opt/utils/update_repo.sh':
+    ensure  => file,
+    mode    => '0755',
+    owner   => root,
+    group   => root,
+    content => file("${module_name}/update_repo.sh"),
   }
 
-  file { "/etc/systemd/system/${opendsa_service}.service":
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode => '0644',
-    source => "puppet:///modules/${module_name}/opendsa/opendsa.service",
-  }
 
  # Do we need port 12000 open? NO
   service { "${opendsa_service}" :