wip

Author: Steveorevo

nodebb.php

@@ -96,15 +96,6 @@ public function setup( $args ) {
             $config = str_replace( '%nodebb_url%', $url, $config );
             file_put_contents( $nodebb_folder . '/config.json', $config );
 
-            // Update proxy and restart nginx
-            if ( $nodeapp_folder . '/' == $nodebb_folder ) {
-                $hcpp->run( "change-web-domain-proxy-tpl $user $domain NodeApp" );
-            }else{
-                $hcpp->nodeapp->generate_nginx_files( $nodeapp_folder );
-                $hcpp->nodeapp->startup_apps( $nodeapp_folder );
-                $hcpp->run( "restart-proxy" );
-            }
-
             // Run initial setup
             $setup = './nodebb setup ';
             $setup .= "'" .  
@@ -116,11 +107,20 @@ public function setup( $args ) {
                 ] ) . "'\n";
             $setup .= "./nodebb restart\n";
             file_put_contents( $nodebb_folder . '/setup.sh', $setup );
-            $cmd = 'runuser -s /bin/bash -l ' . $user . ' -c "cd ' . $nodebb_folder . ' && source setup.sh"' . "\n";
+            $cmd = 'runuser -s /bin/bash -l ' . $user . ' -c "export NVM_DIR=/opt/nvm && source /opt/nvm/nvm.sh && ';
+            $cmd .= 'cd ' . $nodebb_folder . ' && source setup.sh"' . "\n";
             $cmd .= '#rm -f ' . $nodebb_folder . 'setup.sh';
             $hcpp->log( $cmd );
             $hcpp->log(shell_exec( $cmd ));
-            
+
+            // Update proxy and restart nginx
+            if ( $nodeapp_folder . '/' == $nodebb_folder ) {
+                $hcpp->run( "change-web-domain-proxy-tpl $user $domain NodeApp" );
+            }else{
+                $hcpp->nodeapp->generate_nginx_files( $nodeapp_folder );
+                $hcpp->nodeapp->startup_apps( $nodeapp_folder );
+                $hcpp->run( "restart-proxy" );
+            }
             return $args;
         }