mirror of
https://github.com/OutlineFoundation/outline-server.git
synced 2026-11-21 07:12:30 +00:00
Merge branch 'dborkan-docker-group' of github.com:Jigsaw-Code/outline-server into dborkan-docker-group
This commit is contained in:
commit
c4059ff8d5
5 changed files with 38 additions and 28 deletions
|
|
@ -101,6 +101,12 @@ jobs:
|
|||
electronuserland/builder:wine
|
||||
/bin/bash -c "yarn do server_manager/electron_app/package_only_windows" || travis_terminate $?
|
||||
|
||||
- stage: deploy
|
||||
env:
|
||||
- DESC=macos manager
|
||||
os: osx
|
||||
script: yarn do server_manager/electron_app/package_macos
|
||||
|
||||
# Note that because we cannot currently sign Windows binaries on Travis,
|
||||
# these must be manually built and uploaded to the releases page.
|
||||
- stage: release
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"releaseDataUrl": "https://raw.githubusercontent.com/Jigsaw-Code/outline-server/master/release/release_data.json"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "outline-manager",
|
||||
"productName": "Outline Manager",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"description": "Create and manage access to Outline servers",
|
||||
"homepage": "https://getoutline.org/",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -397,27 +397,25 @@ export class App {
|
|||
// it again.
|
||||
return;
|
||||
}
|
||||
if (managedServer.isInstallCompleted()) {
|
||||
// This server has already been successfully installed, however
|
||||
// we may have failed to reach it - this could be due to bad wifi,
|
||||
// firewalls, etc. Notify the user and only delete if the user requests it.
|
||||
this.appRoot.showModalDialog(
|
||||
null, // Don't display any title.
|
||||
'We are unable to reach your Outline server at the moment.',
|
||||
['Delete this server', 'Try again'])
|
||||
.then((clickedButtonIndex: number) => {
|
||||
if (clickedButtonIndex === 0) { // user clicked 'Delete this server'
|
||||
this.cancelServerCreation(managedServer);
|
||||
} else if (clickedButtonIndex === 1) { // user clicked 'Try again'.
|
||||
this.showManagedServer(managedServer, true);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
// An error occured while installing this server.
|
||||
// Show an error and cancel the server creation (e.g. delete the droplet).
|
||||
this.handleServerCreationFailure('Got an error while waiting on server installation', e);
|
||||
this.cancelServerCreation(managedServer);
|
||||
const errorMessage = managedServer.isInstallCompleted() ?
|
||||
'We are unable to connect to your Outline server at the moment. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.' :
|
||||
'There was an error creating your Outline server. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.';
|
||||
SentryErrorReporter.logError(errorMessage);
|
||||
this.appRoot
|
||||
.showModalDialog(
|
||||
null, // Don't display any title.
|
||||
errorMessage, ['Delete this server', 'Try again'])
|
||||
.then((clickedButtonIndex: number) => {
|
||||
if (clickedButtonIndex === 0) { // user clicked 'Delete this server'
|
||||
SentryErrorReporter.logInfo('Deleting unreachable server');
|
||||
managedServer.getHost().delete().then(() => {
|
||||
this.showCreateServer();
|
||||
});
|
||||
} else if (clickedButtonIndex === 1) { // user clicked 'Try again'.
|
||||
SentryErrorReporter.logInfo('Retrying unreachable server');
|
||||
this.showManagedServer(managedServer, true);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -432,10 +430,10 @@ export class App {
|
|||
this.showManagedServer(managedServer);
|
||||
})
|
||||
.catch((e) => {
|
||||
// Don't show a dialog on the login screen.
|
||||
if (!(e instanceof digitalocean_api.XhrError)) {
|
||||
this.handleServerCreationFailure('Failed to create DigitalOcean server', e);
|
||||
}
|
||||
// Sanity check - this error is not expected to occur, as showManagedServer
|
||||
// has it's own error handling.
|
||||
console.error('error from showManagedServer', e);
|
||||
return Promise.reject(e);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ class DigitaloceanServer extends ShadowboxServer implements server.ManagedServer
|
|||
// Server has been installed (Api Url and Certificate have been)
|
||||
// set, but is not healthy. This could occur if the server
|
||||
// is behind a firewall.
|
||||
SentryErrorReporter.logError('digitalocean_server: Server is unreachable, possibly due to firewall.');
|
||||
reject(new errors.UnreachableServerError());
|
||||
}
|
||||
});
|
||||
|
|
@ -154,11 +155,16 @@ class DigitaloceanServer extends ShadowboxServer implements server.ManagedServer
|
|||
// State is already known, so it cannot be changed.
|
||||
return;
|
||||
}
|
||||
if (this.getTagValue(INSTALL_ERROR_TAG) || Date.now() - startTimestamp >= TIMEOUT_MS) {
|
||||
if (this.getTagValue(INSTALL_ERROR_TAG)) {
|
||||
SentryErrorReporter.logError('digitalocean_server: Got error tag ' + this.getTagValue(INSTALL_ERROR_TAG));
|
||||
this.installState = InstallState.ERROR;
|
||||
} else if (Date.now() - startTimestamp >= TIMEOUT_MS) {
|
||||
SentryErrorReporter.logError('digitalocean_server: hit timeout while waiting for installation');
|
||||
this.installState = InstallState.ERROR;
|
||||
} else if (this.setApiUrlAndCertificate()) {
|
||||
// API Url and Certificate have been set, so we have successfully
|
||||
// installed the server and can now make API calls.
|
||||
SentryErrorReporter.logInfo('digitalocean_server: Successfully found API and cert tags');
|
||||
this.installState = InstallState.SUCCESS;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue