-
-
Set up Outline anywhere
-
Outline can run on all major cloud providers. You can also deploy it on your own infrastructure.
+
+
-
-
Tested on:
-
- - Amazon EC2
- - Google Compute Engine
- - Vultr
- - Linode
- - Liquid Web
-
+
Google Cloud Platform
+
+
+
+ - Step-by-step set-up guide
+ - Firewall instructions
+ - Simple install commands
+
+
+
+
-
Get started
-
+
+
+
+
Amazon Web Services
+
+
+
+ - Step-by-step set-up guide
+ - EC2 firewall instructions
+ - Simple install commands
+
+
+
+
+
+
+
+
+
Set up Outline anywhere
+
+
+
+ - Tested on VULTR, Linode, and Liquid Web
+ - Simple install commands
+
+
+
+
+
+
+
@@ -182,8 +275,14 @@
connectToDigitalOceanTapped: function() {
this.fire('ConnectToDigitalOcean');
},
- manualServerTapped: function() {
- this.fire('OpenManualServerEntry');
+ setUpGenericCloudProviderTapped: function() {
+ this.fire('SetUpGenericCloudProviderRequested');
+ },
+ setUpAwsTapped: function() {
+ this.fire('SetUpAwsRequested');
+ },
+ setUpGcpTapped: function() {
+ this.fire('SetUpGcpRequested');
}
});
diff --git a/src/server_manager/ui_components/outline-manual-server-entry.html b/src/server_manager/ui_components/outline-manual-server-entry.html
index 569250e9..a7ef2c12 100644
--- a/src/server_manager/ui_components/outline-manual-server-entry.html
+++ b/src/server_manager/ui_components/outline-manual-server-entry.html
@@ -14,12 +14,14 @@
limitations under the License.
-->
+
+
@@ -36,18 +38,75 @@
border-radius: 2px;
margin: 24px;
text-align: left;
- padding: 24px;
+ }
+ .card-section {
+ padding: 24px 12px;
+ }
+ .card-section:not(:first-child) {
+ border-top: 1px solid rgba(0,0,0,0.12);;
+ }
+ .section-header {
+ padding: 0 6px 0;
+ display: flex;
}
.instructions {
- color: black;
+ font-size: 16px;
+ color: rgba(0,0,0,0.87);
+ line-height: 26px;
+ margin-left: 16px;
+ flex: 2;
+ }
+ .stepcircle {
+ height: 26px;
+ width: 26px;
+ font-size: 14px;
+ background-color: rgba(0, 0, 0, 0.34);
+ border-radius: 50%;
+ float: left;
+ vertical-align: middle;
+ color: #fff;
+ background-color: #141414;
+ margin: auto;
+ text-align: center;
+ line-height: 26px;
+ }
+ .drop-down > * {
+ vertical-align: middle;
+ }
+ .drop-down span {
+ margin: 0 6px;
+ }
+ .drop-down:hover {
+ cursor: pointer;
+ }
+ .section-content {
+ margin: 24px 12px 0 48px;
+ }
+ .section-content-instructions {
+ margin: 24px 12px;
+ }
+ .section-content-instructions li {
+ margin-bottom: 24px;
+ }
+ .section-content-instructions a {
+ color: #00BFA5;
+ }
+ .section-content-instructions iron-icon {
+ color: #00BFA5;
+ width: 16px;
+ height: 16px;
+ margin-left: 4px;
+ vertical-align: middle;
}
.code {
background-color: #ECEFF1;
- color: black;
+ color: rgba(0,0,0,0.87);
font-size: 14px;
font-family: RobotoMono-Regular, monospace;
- margin: 20px 0 40px 0;
- padding: 14px;
+ line-height: 24px;
+ border-radius: 4px;
+ border-bottom: 2px solid #263238;
+ padding: 24px;
word-break: break-all;
}
textarea {
@@ -55,26 +114,19 @@
border: none;
outline: none;
box-sizing: border-box;
- border-bottom: 2px solid #263238;
}
iron-icon {
display: inline-block;
vertical-align: top;
color: black;
}
- .stepContent {
- display: inline-block;
- vertical-align: top;
- width: 442px;
- margin-left: 20px;
- }
- #buttonRow {
- width: 100%;
+ #button-row {
display: flex;
justify-content: space-between;
+ padding: 0 24px 24px 60px;
}
paper-button {
- width: 45%;
+ margin: 0;
}
paper-progress {
margin: 0;
@@ -88,36 +140,119 @@
box-shadow: 0 0 2px 0 rgba(0,0,0,0.14), 0 2px 2px 0 rgba(0,0,0,0.12), 0 1px 3px 0 rgba(0,0,0,0.20);
border-radius: 2px;
width: 45%;
+ background-color: #1DE9B6;
+ color: rgba(0,0,0,0.87);
}
- #terminalIcon {
- width: 20px;
+ #aws-logo {
+ vertical-align: top;
}
- Set up Outline on your server.
- Follow these instructions to install Outline with a
cloud provider or on your own infrastructure.
+ Follow the instructions below
+ These steps will help you install Outline
on [[cloudProviderName]].
-
-
-
-
-
First, log into your server, and run the following command:
-
bash -c "$(wget -qO- https://raw.githubusercontent.com/Jigsaw-Code/outline-server/master/src/server_manager/install_scripts/install_server.sh)"
+
+
+
+
+
+
+
+
+ - Add a new firewall rule to your Compute Engine project.
+ - Type 'outline' in the 'Name' field.
+ - Type 'outline' in the 'Target tags' field.
+ - Type '0.0.0.0/0' in the 'Source IP ranges' field.
+ - Select 'Allow all' under 'Protocols and ports'.
+ - Click 'Create'.
+
+
+
+
+
+
+ - Navigate to the VM instances screen.
+ - Click on the instance where you want to host Outline.
+ - Click 'EDIT' at the top of the VM Instance details screen.
+ - Type 'outline' in the 'Network tags' field.
+ - Click 'SAVE'.
+
+
+
+
+
+
+
+
+
+
+
+
+ - Once you've created your EC2 instance, open the EC2 Management Console.
+ - Under 'Network & Security', select 'Security Groups'.
+ - Click on 'Create Security Group'.
+ - Type 'outline' in the 'Security group name' and 'Description' fields.
+ - Click 'Add Rule'.
+ - Select 'All traffic' under 'Type', and 'Anywhere' under 'Source'.
+
+
+
+
+
+
+ - Navigate to Instances.
+ - Click 'Actions' > 'Networking' > 'Change Security Groups' at the top of the 'Instances' screen.
+ - Select the 'outline' Security Group, unselect other security groups.
+ - Click 'Assign Security Groups'.
+
+
+
+
+
+
+
+
+
+
bash -c "$(wget -qO- https://raw.githubusercontent.com/Jigsaw-Code/outline-server/master/src/server_manager/install_scripts/install_server.sh)"
-
-
-
-
Second, paste the output from the installation process here and click 'Done'.
-
+
+
-
+
@@ -136,10 +271,30 @@
errorText: String,
placeholderText: {
type: String,
- value: '{"apiUrl":"https://xxx.xxx.xxx.xxx:xxxxx/xxxxxxxxxxxxxxxxxxxxxx","certSha256":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"}'
+ value: '{"apiUrl":"https://xxx.xxx.xxx.xxx:xxxxx/xxxxxxxxxxxxxxxxxxxxxx","certSha256":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"}'
},
- showConnection: Boolean
+ showConnection: Boolean,
+ cloudProvider: {
+ type: String,
+ value: 'generic'
+ },
+ cloudProviderName: {
+ type: String,
+ computed: '_computeCloudProviderName(cloudProvider)'
+ },
+ isCloudProviderAws: {
+ type: Boolean,
+ computed: '_computeIsCloudProviderAws(cloudProvider)'
+ },
+ isCloudProviderGcp: {
+ type: Boolean,
+ computed: '_computeIsCloudProviderGcp(cloudProvider)'
+ },
+ isGenericCloudProvider: {
+ type: Boolean,
+ computed: '_computeIsGenericCloudProvider(cloudProvider)'
+ }
},
showError: function(errorTitle, errorMessage) {
this.showConnection = false;
@@ -174,6 +329,34 @@
this.clearError();
this.showConnection = false;
this.$.errorDialog.close();
+ this.$.awsDropDown.hide();
+ this.$.gcpDropDown.hide();
+ },
+ _computeCloudProviderName: function(cloudProvider) {
+ switch(cloudProvider) {
+ case 'aws': return 'Amazon Web Services';
+ case 'gcp': return 'Google Cloud Platform';
+ default: return 'your server';
+ }
+ },
+ _computeIsCloudProviderAws: function(cloudProvider) {
+ return cloudProvider === 'aws'
+ },
+ _computeIsCloudProviderGcp: function(cloudProvider) {
+ return cloudProvider === 'gcp'
+ },
+ _computeIsGenericCloudProvider: function(cloudProvider) {
+ return cloudProvider === 'generic';
+ },
+ _toggleAwsDropDown: function() {
+ this._toggleDropDown(this.$.awsDropDown, this.$.awsDropDownIcon)
+ },
+ _toggleGcpDropDown: function() {
+ this._toggleDropDown(this.$.gcpDropDown, this.$.gcpDropDownIcon);
+ },
+ _toggleDropDown: function(dropDown, icon) {
+ dropDown.toggle();
+ icon.icon = dropDown.opened ? 'arrow-drop-up' : 'arrow-drop-down';
}
});
diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts
index 8a4c8cc0..1a9b840a 100644
--- a/src/server_manager/web_app/app.ts
+++ b/src/server_manager/web_app/app.ts
@@ -37,7 +37,8 @@ const DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716';
// These functions are defined in electron_app/preload.ts.
declare function onElectronEvent(event: string, listener: () => void): void;
-declare function sendElectronEvent(event: string): void;
+// tslint:disable-next-line:no-any
+declare function sendElectronEvent(event: string, ...args: any[]): void;
interface OauthSession {
result: Promise;
isCancelled(): boolean;
@@ -185,6 +186,10 @@ export class App {
this.cancelServerCreation(this.selectedServer);
});
+ appRoot.addEventListener('OpenImageRequested', (event: PolymerEvent) => {
+ sendElectronEvent('open-image', event.detail.imagePath, event.detail.windowTitle);
+ });
+
onElectronEvent('update-downloaded', this.displayAppUpdateNotification.bind(this));
sendElectronEvent('app-ui-ready');
}