diff --git a/welcome/templates/welcome/index.html b/welcome/templates/welcome/index.html index 3c004a7..392d869 100644 --- a/welcome/templates/welcome/index.html +++ b/welcome/templates/welcome/index.html @@ -1,67 +1,317 @@ - - - - Welcome to Django - + + + + + + Welcome to OpenShift + + + + - -
-

Your Django-powered OpenShift project works!

-
-
-

- This project has just a skeleton for you to get started. It includes: -

-
    -
  1. Django project created with python manage.py startproject project .
    2. -
  2. Appropriate database configuration
    3. -
  3. Sample Django app created with python manage.py startapp welcome
    4. -
-

- Now it is time to add your own code. Follow along the Django tutorial - to learn more about Django. -

-
+
+
+

Welcome to your Django application on OpenShift

+
-
-

- If you are running Django's development server in your local host, you can see more information - about this request using the toolbar on the right.
- Please note that by default your Django settings have DEBUG = True and that is not appropriate for production use, - but very handy during development.
- Refer to the Deployment Checklist - before taking this project into a production environment. -

-
-
-

- Server hostname: {{ hostname }}
- Database server: {{ database.engine }} ({{ database.url }})
- {% if database.is_sqlite %} - - Data persistence warning: - You are currently using SQLite. - This is fine for development, but your data won't be persisted - across application deployments. -
- {% endif %} - Page views: {{ count }} -

-
- +
+
+
+

How to use this example application

+

For instrutions on how to use this application with OpenShift, start with reading the Developer Guide.

+ +

Deploying code changes

+

+ The source code for this application is available to be forked from the OpenShift GitHub repository. + You can configure a webhook in your repository to make OpenShift automatically start a build whenever you push your code: +

+ +
    +
  1. From the Web Console homepage, navigate to your project
    2. +
  2. Click on Browse > Builds
    3. +
  3. From the view for your Build click on the button to copy your GitHub webhook
    4. +
  4. Navigate to your repository on GitHub and click on repository settings > webhooks
    5. +
  5. Paste your webhook URL provided by OpenShift — that's it!
    6. +
+

After you save your webhook, if you refresh your settings page you can see the status of the ping that Github sent to OpenShift to verify it can reach the server.

+

Note: adding a webhook requires your OpenShift server to be reachable from GitHub.

+ +

Working in your local Git repository

+

If you forked the application from the OpenShift GitHub example, you'll need to manually clone the repository to your local system. Copy the application's source code Git URL and then run:

+ +
$ git clone <git_url> <directory_to_create>
+
+# Within your project directory
+# Commit your changes and push to OpenShift
+
+$ git commit -a -m 'Some commit message'
+$ git push
+ +

After pushing changes, you'll need to manually trigger a build if you did not setup a webhook as described above.

+ +

Expanding on sample app

+

This project has just a skeleton for you to get started. It includes:

+
    +
  1. Django project created with python manage.py startproject project .
    2. +
  2. Appropriate database configuration
    3. +
  3. Sample Django app created with python manage.py startapp welcome
    4. +
+

+ Now it is time to add your own code. + Follow along the Django tutorial to learn more about Django. +

+

+ If you are running Django's development server in your local host, you can see more information + about this request using the toolbar on the right.
+ Please note that by default your Django settings have DEBUG = True and that is not appropriate for production use, + but very handy during development.
+ Refer to the Deployment Checklist + before taking this project into a production environment. +

+ +
+ +
+
+ +

Managing your application

+ +

Documentation on how to manage your application from the Web Console or Command Line is available at the Developer Guide.

+ +

Web Console

+

You can use the Web Console to view the state of your application components and launch new builds.

+ +

Command Line

+

With the OpenShift command line interface (CLI), you can create applications and manage projects from a terminal.

+ +

Development Resources

+ + +

Request information

+
+Server hostname: {{ hostname }}
+Database server: {{ database.engine }} ({{ database.url }})
+{% if database.is_sqlite %}Data persistence warning: You are currently using SQLite. This is fine for development, but your data won't be persisted across application deployments.{% endif %}
+Page views: {{ count }}
+
+ +
+
+ + +
+ + + +