Skip to content

Commit ef0dcff

Browse files
mboersmaGabriel Monroy
authored andcommitted
Removed references to gitosis.
1 parent 0fb67df commit ef0dcff

5 files changed

Lines changed: 22 additions & 28 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ Deis stands on the shoulders of leading open source technologies:
6060
* [Celery](http://www.celeryproject.org/)
6161
* [Heroku Buildpacks](https://devcenter.heroku.com/articles/buildpacks)
6262
* [Slugbuilder](https://github.com/flynn/slugbuilder) and [slugrunner](https://github.com/flynn/slugrunner)
63-
* [Gitosis](https://github.com/opdemand/gitosis)
6463

6564
## License
6665

cm/mock.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def run_node(node, command):
5959
drwx------ 2 deis deis 4096 Dec 21 10:08 .cache
6060
drwx------ 2 deis deis 4096 Dec 21 10:00 .chef
6161
drwxr-xr-x 15 deis deis 4096 Dec 21 10:09 controller
62-
drwxr-xr-x 8 git git 4096 Dec 21 10:14 gitosis
6362
-rw-r--r-- 1 root root 0 Dec 21 10:00 prevent-apt-update
6463
-rw-r--r-- 1 deis deis 675 Mar 28 2013 .profile
6564
drwxr-xr-x 2 deis deis 4096 Dec 21 10:07 .ssh

docs/components/controller.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Controller
99
The controller is the "brains" of the Deis platform.
1010
The controller manages container :ref:`Formations <formation>`,
1111
comprised of clusters of nodes providing proxy and runtime services for
12-
the application platform. A single controller manages multiple
12+
the application platform. A single controller manages multiple
1313
container formations.
1414

15-
Controllers are tied to a configuration management backend (typically a
15+
Controllers are tied to a configuration management backend (typically a
1616
Chef Server) where data about users, applications and formations is stored.
1717

1818
The controller is in charge of:
@@ -28,8 +28,8 @@ The controller stack includes:
2828
* Django API Server for handling API calls
2929
* PostgreSQL database as a backing store for Django
3030
* Celery / RabbitMQ for dispatching tasks
31-
* Gitosis to handle access control for Git Push over SSH
31+
* A lightweight *gitreceive* hook for ``git push`` access control
3232
* Docker and Buildstep to process Heroku Buildpacks
3333

3434
Follow the :ref:`Operations Guide <operations>` to setup your own private
35-
Deis controller.
35+
Deis controller.

docs/contributing/releases.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ GitHub Issues
2121
Other Repos
2222
-----------
2323

24-
- tag the opdemand/gitosis repo
25-
* ``git checkout master``
26-
* ``git tag vX.Y.Z``
27-
* ``git push --tags origin vX.Y.Z``
24+
- TBD
2825

2926

3027
Chef Repo

docs/gettingstarted/concepts.rst

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Concepts
88
========
99

10-
Deis is an application platform that deploys and scales `Twelve Factor`_ apps
10+
Deis is an application platform that deploys and scales `Twelve Factor`_ apps
1111
using formations of `Chef`_ nodes, `Docker`_ containers and `Nginx`_ proxies.
1212

1313
Formations
@@ -18,69 +18,69 @@ that provide different services to the formation.
1818

1919
Layers
2020
------
21-
:ref:`Layers <layer>` are homogeneous groups of :ref:`Nodes <node>` that
22-
perform work on behalf of a formation. Each node in a layer has
21+
:ref:`Layers <layer>` are homogeneous groups of :ref:`Nodes <node>` that
22+
perform work on behalf of a formation. Each node in a layer has
2323
the same :ref:`Flavor` and configuration, allowing them to be scaled
2424
easily. Formations have two primary types of layers.
2525

2626
Runtime Layers
2727
^^^^^^^^^^^^^^
2828
Runtime layers host :ref:`Containers <container>` for a formation.
29-
Nodes in a runtime layer use a `Chef Databag`_ to deploy containers for
29+
Nodes in a runtime layer use a `Chef Databag`_ to deploy containers for
3030
each :ref:`application` in the formation.
3131

3232
Proxy Layers
3333
^^^^^^^^^^^^
3434
Proxy layers expose :ref:`Applications <application>` to the outside world.
35-
Nodes in a proxy layer use a `Chef Databag`_ to configure routing of
35+
Nodes in a proxy layer use a `Chef Databag`_ to configure routing of
3636
inbound requests to :ref:`Containers <container>` hosted on runtime layers.
3737

3838
Applications
3939
------------
40-
An :ref:`application` lives on a :ref:`formation` where it uses
40+
An :ref:`application` lives on a :ref:`formation` where it uses
4141
:ref:`Containers <container>` to process requests and run background jobs
4242
for a deployed git repository.
4343
Developers use :ref:`Applications <application>` to push code, change config,
4444
scale containers, view logs, or run admin commands --
45-
regardless of the formation's underlying infrastructure.
45+
regardless of the formation's underlying infrastructure.
4646

4747
Build, Release, Run
48-
-------------------
48+
-------------------
4949
Deis enforces strict separation between Build and Run stages
5050
following the `Twelve Factor model`_.
5151

5252
Build Stage
5353
^^^^^^^^^^^
54-
The :ref:`Controller` includes a `Gitosis Server`_ that receives
54+
The :ref:`Controller` includes a *gitreceive* hook that receives
5555
incoming git push requests over SSH and builds applications
56-
inside ephemeral Docker containers.
57-
Tarballs of the /app directory are extracted into a slug and exposed
58-
on the Controller using an Nginx static file server.
56+
inside ephemeral Docker containers.
57+
Tarballs of the /app directory are extracted into a slug and exposed
58+
on the Controller using an Nginx static file server.
5959
The slug is later downloaded by the runtime layer and bind-mounted
6060
into a Docker container for execution.
6161

6262
Release Stage
6363
^^^^^^^^^^^^^
6464
During the release stage, a :ref:`build` is combined with :ref:`config`
6565
to create a new numbered :ref:`release`.
66-
The release stage is triggered any time a new build is created or
66+
The release stage is triggered any time a new build is created or
6767
config is changed, making it easy to rollback code and configuration.
6868

6969
Run Stage
7070
^^^^^^^^^
7171
The run stage updates Chef databags and `converges`_ all nodes in the formation.
72-
The databag specifies the current application releases,
73-
the placement of containers across the runtime layer,
72+
The databag specifies the current application releases,
73+
the placement of containers across the runtime layer,
7474
and the configuration of the proxy layer.
75-
SSH is used to converge nodes in runtime layers followed
75+
SSH is used to converge nodes in runtime layers followed
7676
by nodes in proxy layers, making zero downtime deployment possible.
7777

7878
Backing Services
7979
----------------
8080
In keeping with `Twelve Factor`_ methodology, `backing services`_ like
8181
databases, queues and storage are decoupled and attached using `environment
8282
variables`_. This allows applications to use backing services provided by
83-
other applications, or external/third-party services accessible over the network.
83+
other applications, or external/third-party services accessible over the network.
8484
The use of environment variables makes it easy to swap backing services
8585
when necessary.
8686

@@ -98,6 +98,5 @@ See Also
9898
.. _`Twelve Factor model`: http://12factor.net/build-release-run
9999
.. _`backing services`: http://12factor.net/backing-services
100100
.. _`environment variables`: http://12factor.net/config
101-
.. _`Gitosis Server`: https://github.com/opdemand/gitosis
102101
.. _`Buildstep`: https://github.com/opdemand/buildstep
103102
.. _`converges`: http://docs.opscode.com/essentials_nodes_chef_run.html

0 commit comments

Comments
 (0)