Skip to content

Commit 476f042

Browse files
committed
Merge pull request #611 from opdemand/534-dev-docs-update
Looks good, great job!
2 parents b0cc506 + af4a9d5 commit 476f042

3 files changed

Lines changed: 30 additions & 1 deletion

File tree

docs/contributing/localdev.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,23 @@ Now use ``knife client list`` to test connectivity to the local Chef Server:
5858
chef-validator
5959
chef-webui
6060
61+
Self-hosted Chef Server
62+
```````````````````````
63+
64+
Alternatively, you can `host your own Chef server`_ on your own hardware.
65+
From your server:
66+
67+
* visit `the Chef install page`_ in your web browser
68+
* Click on the "Chef Server" tab and then select the menus that match your operating system
69+
* Right-click on the debian package and select the option that is similar to "copy link location".
70+
* use the wget utility to download the deb
71+
* install the debian package
72+
* configure your machine automatically with :code:`sudo chef-server-ctl reconfigure`
73+
* configure your admin key and validator
74+
* configure the knife command with :code:`knife configure --initial`
75+
76+
You should now have a Chef server and a separate workstation to create your configurations.
77+
6178
Hosted Chef Server
6279
``````````````````
6380
If you don't want to run your own Chef server, you can
@@ -274,6 +291,8 @@ Please see `deis-cookbook`_ for information about contributing Chef code to Deis
274291

275292
.. _`Vagrant`: http://www.vagrantup.com/
276293
.. _`VirtualBox`: https://www.virtualbox.org/
294+
.. _`host your own chef server`: https://www.digitalocean.com/community/articles/how-to-install-a-chef-server-workstation-and-client-on-ubuntu-vps-instances
295+
.. _`the Chef install page`: http://www.getchef.com/chef/install/
277296
.. _`sign up for a free Hosted Chef account`: https://getchef.opscode.com/signup
278297
.. _`knife.rb`: http://docs.opscode.com/config_rb_knife.html
279298
.. _`cookbooks`: http://docs.opscode.com/essentials_cookbooks.html

docs/developer/deploy-application.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ then use the ``deis create`` command to create a new Deis application.
1515
.. code-block:: console
1616
1717
$ cd example-java-jetty # change into your application's git root
18-
$ deis create
18+
$ deis create --formation=dev
1919
Creating application... done, created peachy-waxworks
2020
Git remote deis added
2121

docs/developer/register-user.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ to create a new account. You will be logged in automatically.
2222
Registered myuser
2323
Logged in as myuser
2424
25+
.. note::
26+
27+
As of v0.5.1, the proxy was removed for Deis platform services. It has yet to be added
28+
back in. See `issue 535`_ for more details.
29+
30+
As a workaround, use the following:
31+
32+
:code:`deis register http://deis.example.com:8000`
33+
2534
Upload Your SSH Public Key
2635
--------------------------
2736
Use the ``deis keys:add`` command to upload your default SSH public key, usually one of:
@@ -37,3 +46,4 @@ Use the ``deis keys:add`` command to upload your default SSH public key, usually
3746
Which would you like to use with Deis? 1
3847
Uploading /Users/myuser/.ssh/id_rsa.pub to Deis... done
3948
49+
.. _`issue 535`: https://github.com/opdemand/deis/issues/535

0 commit comments

Comments
 (0)