Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@piotrzarzycki21
piotrzarzycki21 committed Jul 6, 2023
2 parents 019e595 + be53b14 commit f7083d4
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 24 deletions.
12 changes: 11 additions & 1 deletion Assets/provisioners/demo-tasks/0.1.17/templates/Hosts.template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,17 @@ hosts:
genesis_packages:
- netmonitor
- SuperHumanPortal

domino_server_installer_tar: ::DOMINO_INSTALLER::
domino_installer_fixpack_install: ::DOMINO_INSTALLER_FIXPACK_INSTALL::
domino_server_fixpack_tar: ::DOMINO_INSTALLER_FIXPACK::
nomadweb_archive: ::NOMAD_INSTALLER::
nomadweb_version: '1.0.6'
leap_archive: ::LEAP_INSTALLER::
traveler_archive: ::TRAVELER_INSTALLER::
verse_archive: ::VERSE_INSTALLER::
appdevpack_archive: ::APPDEVPACK_INSTALLER::
domino_rest_api_archive: ::DOMINO_REST_API_INSTALLER::

## When using the default: demo.startcloud.com as the hostname and domain, we use the default-signed.crt certificates to provide a valid SSL
## If the hostname and domain, ie demo.startcloud.com do not match the certificate we provide (ie demo.startcloud.com in default-signed.crt), some services may not start (ie nomadweb)
## If a user does not mind using a self signed certificate for their development testing for their own domain or are unable to replace the default-signed.crt files
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## Super Human Installer [0.8.16]

This release improves installation of selected installers different than default.

### Added

* Allow user pick up different version of installers than provided as default one ([#76](https://github.com/Moonshine-IDE/Super.Human.Installer/issues/76))

### Fixed

* Fixed crash when using nomad-server greater than 1.0.6 ([#75](https://github.com/Moonshine-IDE/Super.Human.Installer/issues/75))

## Super Human Installer [0.8.15]

Expand Down
29 changes: 23 additions & 6 deletions Genesis/Source/prominic/sys/applications/oracle/VirtualBox.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,11 @@ class VirtualBox extends AbstractApp {
return ExecutorManager.getInstance().get( '${VirtualBoxExecutorContext.PowerOffVM}${machine.virtualBoxId}' );

var args:Array<String> = [ "controlvm" ];
args.push( machine.virtualBoxId );
if (machine.virtualBoxId != null)
{
args.push( machine.virtualBoxId );
}

args.push( "poweroff" );

var extraArgs:Array<Dynamic> = [];
Expand All @@ -314,12 +318,21 @@ class VirtualBox extends AbstractApp {
_tempShowVMInfoData = "";

var args:Array<String> = [ "showvminfo" ];
args.push( machine.virtualBoxId );
if ( machineReadable ) args.push( "--machinereadable" );
if (machine.virtualBoxId != null)
{
args.push( machine.virtualBoxId );
}

if ( machineReadable )
{
args.push( "--machinereadable" );
}

var extraArgs:Array<Dynamic> = [];
extraArgs.push( machine );

Logger.debug( '${this}: getShowVMInfo with args ${args} and extraArgs ${extraArgs}' );

final executor = new Executor( this.path + this._executable, args, extraArgs );
executor.onStdOut.add( _showVMInfoExecutorStandardOutput ).onStop.add( _showVMInfoExecutorStopped );
ExecutorManager.getInstance().set( '${VirtualBoxExecutorContext.ShowVMInfo}${machine.virtualBoxId}', executor );
Expand All @@ -335,11 +348,15 @@ class VirtualBox extends AbstractApp {

var args:Array<String> = [ "unregistervm" ];
if ( delete ) args.push( "--delete" );
args.push( machine.virtualBoxId );


if (machine.virtualBoxId != null)
{
args.push( machine.virtualBoxId );
}

var extraArgs:Array<Dynamic> = [];
extraArgs.push( machine );

final executor = new Executor( this.path + this._executable, args, extraArgs );
executor.onStop.add( _unregisterExecutorStopped );
ExecutorManager.getInstance().set( '${VirtualBoxExecutorContext.UnregisterVM}${machine.virtualBoxId}', executor );
Expand Down
10 changes: 9 additions & 1 deletion Source/superhuman/components/RolePage.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,15 +354,21 @@ class RolePickerItem extends LayoutGroup {
var currentDir:String;

fd.onSelect.add( path -> {


var currentPath = new Path(path);
var fullFileName = currentPath.file + "." + currentPath.ext;

currentDir = Path.directory( path );

if ( currentDir != null ) SuperHumanInstaller.getInstance().config.user.lastuseddirectory = currentDir;

var v = FileTools.checkMD5( path, SuperHumanInstaller.getInstance().validHashes.get( _roleImpl.role.value ).get( "installers" ) );

if ( v ) {

_roleImpl.role.files.installer = path;
_roleImpl.role.files.installerFileName = fullFileName;

updateData();

} else {
Expand All @@ -377,6 +383,7 @@ class RolePickerItem extends LayoutGroup {

case 0:
_roleImpl.role.files.installer = path;
_roleImpl.role.files.installerFileName = fullFileName;
updateData();

default:
Expand All @@ -403,6 +410,7 @@ class RolePickerItem extends LayoutGroup {
fd.onSelect.add( path -> {

currentDir = Path.directory( path );

if ( currentDir != null ) SuperHumanInstaller.getInstance().config.user.lastuseddirectory = currentDir;

var v = FileTools.checkMD5( path, SuperHumanInstaller.getInstance().validHashes.get( _roleImpl.role.value ).get( "hotfixes" ) );
Expand Down
57 changes: 42 additions & 15 deletions Source/superhuman/server/provisioners/DemoTasks.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,15 +536,42 @@ class HostsFileGenerator {
ROLE_RESTAPI: "",
ROLE_DOMINO_INSTALL: "",
ROLE_DOMINO_VAGRANT_REST_API: "",


DOMINO_INSTALLER: "",
DOMINO_INSTALLER_FIXPACK_INSTALL: false,
DOMINO_INSTALLER_FIXPACK: "",

NOMAD_INSTALLER: "",
NOMAD_VERSION: "",
LEAP_INSTALLER: "",
TRAVELER_INSTALLER: "",
VERSE_INSTALLER: "",
APPDEVPACK_INSTALLER: "",
DOMINO_REST_API_INSTALLER: "",

CERT_SELFSIGNED: ( provisioner.server.url.hostname + "." + provisioner.server.url.domainName ).toLowerCase() != "demo.startcloud.com",

};

for ( r in provisioner.server.roles.value ) {

var replaceWith:String = "";

var roleValue = r.value;
var replaceWith:String = "";
var installerName:String = r.files.installerFileName == null ? "" : r.files.installerFileName;

if (r.value == "domino")
{
replace.DOMINO_INSTALLER = installerName;

if (r.files.fixpacks != null && r.files.fixpacks.length > 0)
{
var fixPacksPath = new Path(r.files.fixpacks[0]);

replace.DOMINO_INSTALLER_FIXPACK_INSTALL = true;
replace.DOMINO_INSTALLER_FIXPACK = fixPacksPath.file + "." + fixPacksPath.ext;
}
}

if ( r.value == "leap" ) {

if ( r.enabled ) {
Expand All @@ -556,10 +583,10 @@ class HostsFileGenerator {
replaceWith = "#- name: domino-leap";

}


replace.LEAP_INSTALLER = installerName;
replace.ROLE_LEAP = replaceWith;

}
}

if ( r.value == "nomadweb" ) {

Expand All @@ -572,9 +599,9 @@ class HostsFileGenerator {
replaceWith = "#- name: domino-nomadweb";

}


replace.NOMAD_INSTALLER = installerName;
replace.ROLE_NOMADWEB = replaceWith;

}

if ( r.value == "traveler" ) {
Expand All @@ -588,9 +615,9 @@ class HostsFileGenerator {
replaceWith = "#- name: domino-traveler";

}


replace.TRAVELER_INSTALLER = installerName;
replace.ROLE_TRAVELER = replaceWith;

}

if ( r.value == "traveler" ) {
Expand Down Expand Up @@ -621,8 +648,8 @@ class HostsFileGenerator {

}

replace.VERSE_INSTALLER = installerName;
replace.ROLE_VERSE = replaceWith;

}

if ( r.value == "appdevpack" ) {
Expand All @@ -636,9 +663,9 @@ class HostsFileGenerator {
replaceWith = "#- name: domino-appdevpack";

}


replace.APPDEVPACK_INSTALLER = installerName;
replace.ROLE_APPDEVPACK = replaceWith;

}

if ( r.value == "domino-rest-api" ) {
Expand All @@ -652,9 +679,9 @@ class HostsFileGenerator {
replaceWith = "#- name: domino-rest-api";

}


replace.DOMINO_REST_API_INSTALLER = installerName;
replace.ROLE_RESTAPI = replaceWith;

}

replace.ROLE_STARTCLOUD_QUICK_START = "- name: startcloud-quick-start";
Expand Down
1 change: 1 addition & 0 deletions Source/superhuman/server/roles/ServerRoleFiles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ package superhuman.server.roles;
typedef ServerRoleFiles = {

?installer:String,
?installerFileName:String,
?hotfixes:Array<String>,
?fixpacks:Array<String>,

Expand Down
6 changes: 5 additions & 1 deletion project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<include path="Genesis/GenesisApplication.xml"/>
<!-- Override properties, add new ones below -->

<meta version="0.8.15"/>
<meta version="0.8.16"/>
<meta unless="debug" title="Super.Human.Installer"/>
<meta title="Super.Human.Installer Development" if="debug"/>

Expand Down Expand Up @@ -57,4 +57,8 @@
<haxeflag value="include('genesis.application')" name="--macro"/>
<haxeflag value="include('superhuman')" name="--macro"/>

<haxedef name="HXCPP_STACK_LINE" />
<haxedef name="HXCPP_STACK_TRACE"/>
<haxedef name="HXCPP_CHECK_POINTER"/>

</project>

0 comments on commit f7083d4

Please sign in to comment.