Skip to content

Commit 89de88f

Browse files
committed
ref(client,registration,deploy): move stuff to more logical spot
1 parent 9e7a124 commit 89de88f

3 files changed

Lines changed: 40 additions & 43 deletions

File tree

src/applications/deploying-apps.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
An [Application][] is deployed to Deis using `git push` or the `deis` client.
44

5-
65
## Supported Applications
76

87
Deis can deploy any application or service that can run inside a Docker container. In order to be scaled horizontally, applications must follow the [Twelve-Factor App][] methodology and store any application state in external backing services.
@@ -25,6 +24,20 @@ using the URL supplied by their Deis administrator.
2524
password:
2625
Logged in as deis
2726

27+
## Upload Your SSH Public Key
28+
29+
If you plan on using `git push` to deploy applications to Deis, you must provide your SSH public key. Use the `deis keys:add` command to upload your default SSH public key, usually one of:
30+
31+
* ~/.ssh/id_rsa.pub
32+
* ~/.ssh/id_dsa.pub
33+
34+
```
35+
$ deis keys:add
36+
Found the following SSH public keys:
37+
1) id_rsa.pub
38+
Which would you like to use with Deis? 1
39+
Uploading /Users/myuser/.ssh/id_rsa.pub to Deis... done
40+
```
2841

2942
## Select a Build Process
3043

src/using-workflow/installing-the-client.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ somewhere in your $PATH:
1616
$ ln -fs $PWD/deis /usr/local/bin/deis
1717

1818

19-
## Proxy Support
20-
21-
If your workstation uses a proxy to reach the network where the cluster lies,
22-
set the `http_proxy` or `https_proxy` environment variable to enable proxy support:
23-
24-
$ export http_proxy="http://proxyip:port"
25-
$ export https_proxy="http://proxyip:port"
26-
27-
!!! note
28-
Configuring a proxy is generally not necessary for local Vagrant clusters.
29-
30-
3119
## Integrated Help
3220

3321
The Deis client comes with comprehensive documentation for every command.
@@ -65,7 +53,6 @@ To get help on subcommands, use `deis help [subcommand]`:
6553

6654
## Multiple Profile Support
6755

68-
6956
The Deis client supports running commands against multiple installations
7057
and/or accounts by setting the `$DEIS_PROFILE` environment variable
7158
before logging in and running any subsequent commands. If not set, all
@@ -76,5 +63,15 @@ of running the ps command against an app with the same name from two profiles:
7663
$ DEIS_PROFILE=production deis ps -a helloworld
7764
$ DEIS_PROFILE=staging deis ps -a helloworld
7865

66+
## Proxy Support
67+
68+
If your workstation uses a proxy to reach the network where the cluster lies,
69+
set the `http_proxy` or `https_proxy` environment variable to enable proxy support:
70+
71+
$ export http_proxy="http://proxyip:port"
72+
$ export https_proxy="http://proxyip:port"
73+
74+
!!! note
75+
Configuring a proxy is generally not necessary for local Vagrant clusters.
7976

8077
[controller]: ../understanding-workflow/components.md#controller

src/using-workflow/registering-a-user.md

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ To use Deis, you must first register a user on the [Controller][].
66
## Register with a Controller
77

88
Use `deis register` with the [Controller][] URL (supplied by your Deis administrator)
9-
to create a new account. When you have completed the registration process, you will be logged in
10-
automatically.
9+
to create a new account. After successful registration you will be logged in as the new user.
1110

1211
$ deis register http://deis.example.com
1312
username: myuser
@@ -18,47 +17,35 @@ automatically.
1817
Logged in as myuser
1918

2019
!!! important
21-
The first user to register with Deis receives "superuser" privileges. Additional users who
22-
register will be ordinary users. It's also possible to disable user registration after creating
23-
the superuser account.
20+
The first user to register with Deis Workflow is automatically becomes a
21+
"superuser". Additional users who register will be ordinary users. It's also
22+
possible to disable user registration after creating the superuser account.
2423

24+
## Login to Workflow
2525

26-
## Upload Your SSH Public Key
27-
28-
If you plan on using `git push` to deploy applications to Deis, you must provide your SSH public key. Use the `deis keys:add` command to upload your default SSH public key, usually one of:
29-
30-
* ~/.ssh/id_rsa.pub
31-
* ~/.ssh/id_dsa.pub
32-
33-
```
34-
$ deis keys:add
35-
Found the following SSH public keys:
36-
1) id_rsa.pub
37-
Which would you like to use with Deis? 1
38-
Uploading /Users/myuser/.ssh/id_rsa.pub to Deis... done
39-
```
26+
If you already have an account, use `deis login` to authenticate against the Deis Workflow API.
4027

28+
$ deis login http://deis.example.com
29+
username: deis
30+
password:
31+
Logged in as deis
4132

42-
## Logout from a Controller
33+
## Logout from Workflow
4334

4435
Logout of an existing controller session using `deis logout`.
4536

4637
$ deis logout
4738
Logged out as deis
4839

40+
## Verify your session
4941

50-
## Login to a Controller
42+
You can verify your client configuration by running `deis whoami`.
5143

52-
If you already have an account, use `deis login` to authenticate against the Deis [Controller][].
53-
54-
$ deis login http://deis.example.com
55-
username: deis
56-
password:
57-
Logged in as deis
44+
$ deis whoami
45+
You are deis at http://deis.example.com
5846

5947
!!! note
60-
Deis session information is stored in your user's ~/.deis directory.
61-
48+
Session and client configuration is stored in the `~/.deis/client.json` file.
6249

6350
[controller]: ../understanding-workflow/components.md#controller
6451
[router]: ../understanding-workflow/components.md#router

0 commit comments

Comments
 (0)