Update for v2.X pluginable support

Author: Steveorevo

Installers/NodeBB/NodeBBSetup.php

@@ -1,8 +1,6 @@
 <?php
-
 namespace Hestia\WebApp\Installers\NodeBB;
 use Hestia\WebApp\Installers\BaseSetup as BaseSetup;
-require_once( '/usr/local/hestia/web/pluginable.php' );
 
 class NodeBBSetup extends BaseSetup {
 	protected $appInfo = [
@@ -16,9 +14,9 @@ class NodeBBSetup extends BaseSetup {
 	protected $appname = "nodebb";
 	protected $config = [
 		"form" => [
-			"nodebb_username" => ["value" => "nbbadmin"],
-			"nodebb_password" => "password",
-			"nodebb_email" => ["value" => ""],
+			"nodeBB_username" => ["value" => "nbbadmin"],
+			"nodeBB_password" => "password",
+			"nodeBB_email" => ["value" => ""],
 			"nodebb_folder" => ["type" => "text", "value" => "", "placeholder" => "/", "label" => "Install Directory"]
 		],
 		"database" => true,
@@ -32,19 +30,12 @@ class NodeBBSetup extends BaseSetup {
 		],
 	];
 
-	public function __construct($domain, $appcontext) {
-		$v = trim( file_get_contents( '/usr/local/hestia/plugins/nodebb/nodebb_version.sh' ) );
-		$v = str_replace( ['nodebb_version=', '"'], "", $v );
-		$this->appInfo['version'] = $v;
-		parent::__construct($domain, $appcontext);
-	}
-
 	public function install(array $options = null) {
 		global $hcpp;
 		$parse = explode( '/', $this->getDocRoot() );
 		$options['user'] = $parse[2];
 		$options['domain'] = $parse[4];
-		$hcpp->run( 'invoke-plugin nodebb_install ' . escapeshellarg( json_encode( $options ) ) );
+		$hcpp->run( 'v-invoke-plugin nodebb_setup ' . escapeshellarg( json_encode( $options ) ) );
 		return true;
 	}
 }

README.md

@@ -3,29 +3,23 @@ A plugin for Hestia Control Panel (via hestiacp-pluginable) that enables hosting
 With this plugin installed, a new Quick Installer option will appear. User accounts can host their own NodeBB instance either in the root domain or as a subfolder installation. For instance, it is possible to run WordPress in the root domain while having NodeBB installed on the same domain in a subfolder (i.e. https://example.com/nodebb-forum).
 
 ## Installation
-HCPP-NodeBB requires an Ubuntu based installation of [Hestia Control Panel](https://hestiacp.com) in addition to an installation of [HestiaCP-Pluginable](https://github.com/virtuosoft-dev/hestiacp-pluginable) *and* [HCPP-NodeApp](https://github.com/virtuosoft-dev/hcpp-nodeapp) to function; please ensure that you have first installed both Pluginable and NodeApp on your Hestia Control Panel before proceeding. Switch to a root user and simply clone this project to the /usr/local/hestia/plugins folder. It should appear as a subfolder with the name `nodebb`, i.e. `/usr/local/hestia/plugins/nodebb`.
-
-First, switch to root user:
-```
-sudo -s
-```
-
-Then simply clone the repo to your plugins folder, with the name `nodebb`:
+HCPP-NodeBB requires an Ubuntu or Debian based installation of [Hestia Control Panel](https://hestiacp.com) in addition to an installation of [HestiaCP-Pluginable](https://github.com/virtuosoft-dev/hestiacp-pluginable) *and* [HCPP-NodeApp](https://github.com/virtuosoft-dev/hcpp-nodeapp) to function; please ensure that you have first installed pluginable on your Hestia Control Panel before proceeding. Clone the latest release version (i.e. replace **v2.0.0** below with the latest release version) to the nodebb folder:
 
 ```
 cd /usr/local/hestia/plugins
-git clone https://github.com/virtuosoft-dev/hcpp-nodebb nodebb
+sudo git clone --branch v2.0.0 https://github.com/virtuosoft-dev/hcpp-nodebb nodebb
 ```
 
 Note: It is important that the destination plugin folder name is `nodebb`.
 
-Be sure to logout and login again to your Hestia Control Panel as the admin user or, as admin, visit Server (gear icon) -> Configure -> Plugins -> Save; the plugin will immediately start installing NodeJS and NodeBB depedencies in the background. A notification will appear under the admin user account indicating *"NodeBB plugin has finished installing"* when complete. This may take awhile before the options appear in Hestia. You can force manual installation via root level SSH:
+Be sure to logout and login again to your Hestia Control Panel as the admin user or, as admin, visit Server (gear icon) -> Configure -> Plugins -> Save; the plugin will immediately start installing depedencies in the background. 
+
+A notification will appear under the admin user account indicating *"NodeBB plugin has finished installing"* when complete. This may take awhile before the options appear in Hestia. You can force manual installation via:
 
 ```
-sudo -s
 cd /usr/local/hestia/plugins/nodebb
-./install
-touch "/usr/local/hestia/data/hcpp/installed/nodebb"
+sudo ./install
+sudo touch "/usr/local/hestia/data/hcpp/installed/nodebb"
 ```
 
 ## Support the creator

install

@@ -1,25 +1,14 @@
 #!/bin/bash
 export DEBIAN_FRONTEND=noninteractive
+dir=$PWD
 
 ############################################
 # Install NodeBB
 ############################################
-
-dir=$PWD
-source "$dir/nodebb_version.sh"
-if [ ! -d "/opt/nodebb/v$nodebb_version" ]; then
-
-    mkdir -p "/opt/nodebb/v$nodebb_version"
-    cd "/opt/nodebb/v$nodebb_version"
-    git clone -b "v$nodebb_version" https://github.com/NodeBB/NodeBB.git nodebb
-    cd nodebb
-    rm -rf .DS_Store
-    ./nodebb setup --help
-fi
-
 # Copy over our Quick Install App
-cd "$dir"
+cd $dir
 rsync -r ./Installers/ /usr/local/hestia/web/src/app/WebApp/Installers/
+/usr/local/hestia/bin/v-invoke-plugin nodebb_install
 
 # Notify installation has finished
-/usr/local/hestia/bin/v-add-user-notification admin "NodeBB" "💙 NodeBB plugin has finished installing."
+/usr/local/hestia/bin/v-add-user-notification admin "NodeBB" "💙 NodeBB plugin has finished installing."