From 495c834ff08bd8bc6429045ffb2d6b11d8f2eec0 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 11 Feb 2015 17:34:37 +0000 Subject: [PATCH] Added "Trying wagtail" page --- docs/getting_started/index.rst | 1 + docs/getting_started/installation.rst | 50 --------------------- docs/getting_started/trying_wagtail.rst | 59 +++++++++++++++++++++++++ docs/index.rst | 2 + 4 files changed, 62 insertions(+), 50 deletions(-) create mode 100644 docs/getting_started/trying_wagtail.rst diff --git a/docs/getting_started/index.rst b/docs/getting_started/index.rst index 239df37e1..8b72c0206 100644 --- a/docs/getting_started/index.rst +++ b/docs/getting_started/index.rst @@ -5,6 +5,7 @@ Getting started .. toctree:: :maxdepth: 2 + trying_wagtail installation creating_your_project using_vagrant diff --git a/docs/getting_started/installation.rst b/docs/getting_started/installation.rst index 0628f13ad..9fd94f43e 100644 --- a/docs/getting_started/installation.rst +++ b/docs/getting_started/installation.rst @@ -60,53 +60,3 @@ To enable ElasticSearch for your project, uncomment the ``elasticsearch`` line f Image feature detection ----------------------- Wagtail can use the OpenCV computer vision library to detect faces and other features in images, and use this information to select the most appropriate centre point when cropping the image. OpenCV is pre-installed as part of the Vagrant virtual machine image, and Vagrant users can enable this by setting ``WAGTAILIMAGES_FEATURE_DETECTION_ENABLED`` to True in ``myprojectname/settings/base.py``. For installation outside of Vagrant, see :ref:`image_feature_detection`. - - -Alternative installation methods -================================ - -Ubuntu ------- - -If you have a fresh instance of Ubuntu 13.04 or later, you can install Wagtail, -along with a demonstration site containing a set of standard templates and page -types, in one step. As the root user:: - - curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/ubuntu.sh; bash ubuntu.sh - -This script installs all the dependencies for a production-ready Wagtail site, -including PostgreSQL, Redis, Elasticsearch, Nginx and uwsgi. We -recommend you check through the script before running it, and adapt it according -to your deployment preferences. The canonical version is at -`github.com/torchbox/wagtail/blob/master/scripts/install/ubuntu.sh -`_. - - -Debian ------- - -If you have a fresh instance of Debian 7, you can install Wagtail, along with a -demonstration site containing a set of standard templates and page types, in one -step. As the root user:: - - curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/debian.sh; bash debian.sh - -This script installs all the dependencies for a production-ready Wagtail site, -including PostgreSQL, Redis, Elasticsearch, Nginx and uwsgi. We -recommend you check through the script before running it, and adapt it according -to your deployment preferences. The canonical version is at -`github.com/torchbox/wagtail/blob/master/scripts/install/debian.sh -`_. - - -Docker ------- - -`@oyvindsk `_ has built a Dockerfile for the Wagtail demo. Simply run:: - - docker run -p 8000:8000 -d oyvindsk/wagtail-demo - -then access the site at http://your-ip:8000 and the admin -interface at http://your-ip:8000/admin using admin / test. - -See https://index.docker.io/u/oyvindsk/wagtail-demo/ for more details. diff --git a/docs/getting_started/trying_wagtail.rst b/docs/getting_started/trying_wagtail.rst new file mode 100644 index 000000000..93d5ed077 --- /dev/null +++ b/docs/getting_started/trying_wagtail.rst @@ -0,0 +1,59 @@ +============== +Trying Wagtail +============== + + +Wagtail demo +============ + + + +One line install +================ + + +Ubuntu +------ + +If you have a fresh instance of Ubuntu 13.04 or later, you can install Wagtail, +along with a demonstration site containing a set of standard templates and page +types, in one step. As the root user:: + + curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/ubuntu.sh; bash ubuntu.sh + +This script installs all the dependencies for a production-ready Wagtail site, +including PostgreSQL, Redis, Elasticsearch, Nginx and uwsgi. We +recommend you check through the script before running it, and adapt it according +to your deployment preferences. The canonical version is at +`github.com/torchbox/wagtail/blob/master/scripts/install/ubuntu.sh +`_. + + +Debian +------ + +If you have a fresh instance of Debian 7, you can install Wagtail, along with a +demonstration site containing a set of standard templates and page types, in one +step. As the root user:: + + curl -O https://raw.githubusercontent.com/torchbox/wagtail/master/scripts/install/debian.sh; bash debian.sh + +This script installs all the dependencies for a production-ready Wagtail site, +including PostgreSQL, Redis, Elasticsearch, Nginx and uwsgi. We +recommend you check through the script before running it, and adapt it according +to your deployment preferences. The canonical version is at +`github.com/torchbox/wagtail/blob/master/scripts/install/debian.sh +`_. + + +Docker +====== + +`@oyvindsk `_ has built a Dockerfile for the Wagtail demo. Simply run:: + + docker run -p 8000:8000 -d oyvindsk/wagtail-demo + +then access the site at http://your-ip:8000 and the admin +interface at http://your-ip:8000/admin using admin / test. + +See https://index.docker.io/u/oyvindsk/wagtail-demo/ for more details. diff --git a/docs/index.rst b/docs/index.rst index 05fe57ce0..1f99d42ea 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,6 +8,8 @@ Below are some useful links to help you get started with Wagtail. * **First steps** + :doc:`getting_started/trying_wagtail` + :doc:`getting_started/installation` :doc:`getting_started/creating_your_project`