X-dark/django-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #35 from gabemontero/onlineMotivatedWordsmithing

Browse source 
edits consistent with UI philosophy
This commit is contained in:
Ben Parees 2016-03-07 21:16:11 +00:00
commit 3375b23fc8
2 changed files with 44 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
openshift/templates/django-postgresql.json
View file

@ -339,85 +339,81 @@
"parameters": [ "parameters": [
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory limit", "displayName": "Memory Limit",
"description": "Maximum amount of memory the Django container can use", "description": "Maximum amount of memory the Django container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "MEMORY_POSTGRESQL_LIMIT", "name": "MEMORY_POSTGRESQL_LIMIT",
"displayName": "Memory limit", "displayName": "Memory Limit (PostgreSQL)",
"description": "Maximum amount of memory the PostgreSQL container can use", "description": "Maximum amount of memory the PostgreSQL container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "SOURCE_REPOSITORY_URL", "name": "SOURCE_REPOSITORY_URL",
"displayName": "Source repository URL", "displayName": "Git Repository URL",
"description": "The URL of the repository with your application source code", "description": "The URL of the repository with your application source code.",
"value": "https://github.com/openshift/django-ex.git" "value": "https://github.com/openshift/django-ex.git"
}, },
{ {
"name": "SOURCE_REPOSITORY_REF", "name": "SOURCE_REPOSITORY_REF",
"displayName": "Source repository reference", "displayName": "Git Reference",
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch" "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch."
}, },
{ {
"name": "CONTEXT_DIR", "name": "CONTEXT_DIR",
"displayName": "Context directory", "displayName": "Context Directory",
"description": "Set this to the relative path to your project if it is not in the root of your repository" "description": "Set this to the relative path to your project if it is not in the root of your repository."
}, },
{ {
"name": "APPLICATION_DOMAIN", "name": "APPLICATION_DOMAIN",
"displayName": "Application hostname", "displayName": "Application Hostname",
"description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.", "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
"value": "" "value": ""
}, },
{ {
"name": "GITHUB_WEBHOOK_SECRET", "name": "GITHUB_WEBHOOK_SECRET",
"displayName": "GitHub webhook secret", "displayName": "GitHub Webhook Secret",
"description": "A secret string used to configure the GitHub webhook", "description": "A secret string used to configure the GitHub webhook.",
"generate": "expression", "generate": "expression",
"from": "[a-zA-Z0-9]{40}" "from": "[a-zA-Z0-9]{40}"
}, },
{ {
"name": "DATABASE_SERVICE_NAME", "name": "DATABASE_SERVICE_NAME",
"displayName": "Database service name", "displayName": "Database Service Name",
"description": "Database service name",
"value": "postgresql" "value": "postgresql"
}, },
{ {
"name": "DATABASE_ENGINE", "name": "DATABASE_ENGINE",
"displayName": "Database engine", "displayName": "Database Engine",
"description": "Database engine: postgresql, mysql or sqlite (default)", "description": "Database engine: postgresql, mysql or sqlite (default).",
"value": "postgresql" "value": "postgresql"
}, },
{ {
"name": "DATABASE_NAME", "name": "DATABASE_NAME",
"displayName": "Database name", "displayName": "Database Name",
"description": "Database name",
"value": "default" "value": "default"
}, },
{ {
"name": "DATABASE_USER", "name": "DATABASE_USER",
"displayName": "Database user name", "displayName": "Database Username",
"description": "Database user name",
"value": "django" "value": "django"
}, },
{ {
"name": "DATABASE_PASSWORD", "name": "DATABASE_PASSWORD",
"displayName": "Database user password", "displayName": "Database User Password",
"description": "Database user password",
"generate": "expression", "generate": "expression",
"from": "[a-zA-Z0-9]{16}" "from": "[a-zA-Z0-9]{16}"
}, },
{ {
"name": "APP_CONFIG", "name": "APP_CONFIG",
"displayName": "Application configuration file path", "displayName": "Application Configuration File Path",
"description": "Relative path to Gunicorn configuration file (optional)" "description": "Relative path to Gunicorn configuration file (optional)."
}, },
{ {
"name": "DJANGO_SECRET_KEY", "name": "DJANGO_SECRET_KEY",
"displayName": "Djange secret key", "displayName": "Djange Secret Key",
"description": "Set this to a long random string", "description": "Set this to a long random string.",
"generate": "expression", "generate": "expression",
"from": "[\\w]{50}" "from": "[\\w]{50}"
} }

46
openshift/templates/django.json
View file

@ -225,73 +225,69 @@
"parameters": [ "parameters": [
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory limit", "displayName": "Memory Limit",
"description": "Maximum amount of memory the container can use", "description": "Maximum amount of memory the container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "SOURCE_REPOSITORY_URL", "name": "SOURCE_REPOSITORY_URL",
"displayName": "Source repository URL", "displayName": "Git Repository URL",
"description": "The URL of the repository with your application source code", "description": "The URL of the repository with your application source code.",
"value": "https://github.com/openshift/django-ex.git" "value": "https://github.com/openshift/django-ex.git"
}, },
{ {
"name": "SOURCE_REPOSITORY_REF", "name": "SOURCE_REPOSITORY_REF",
"displayName": "Source repository reference", "displayName": "Git Reference",
"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch" "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch."
}, },
{ {
"name": "CONTEXT_DIR", "name": "CONTEXT_DIR",
"displayName": "Context directory", "displayName": "Context Directory",
"description": "Set this to the relative path to your project if it is not in the root of your repository" "description": "Set this to the relative path to your project if it is not in the root of your repository."
}, },
{ {
"name": "APPLICATION_DOMAIN", "name": "APPLICATION_DOMAIN",
"displayName": "Application hostname", "displayName": "Application Hostname",
"description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.", "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
"value": "" "value": ""
}, },
{ {
"name": "GITHUB_WEBHOOK_SECRET", "name": "GITHUB_WEBHOOK_SECRET",
"displayName": "GitHub webhook secret", "displayName": "GitHub Webhook Secret",
"description": "A secret string used to configure the GitHub webhook", "description": "A secret string used to configure the GitHub webhook.",
"generate": "expression", "generate": "expression",
"from": "[a-zA-Z0-9]{40}" "from": "[a-zA-Z0-9]{40}"
}, },
{ {
"name": "DATABASE_SERVICE_NAME", "name": "DATABASE_SERVICE_NAME",
"displayName": "Database service name", "displayName": "Database Service Name"
"description": "Database service name"
}, },
{ {
"name": "DATABASE_ENGINE", "name": "DATABASE_ENGINE",
"displayName": "Database engine", "displayName": "Database Engine",
"description": "Database engine: postgresql, mysql or sqlite (default)" "description": "Database engine: postgresql, mysql or sqlite (default)."
}, },
{ {
"name": "DATABASE_NAME", "name": "DATABASE_NAME",
"displayName": "Database name", "displayName": "Database Name"
"description": "Database name"
}, },
{ {
"name": "DATABASE_USER", "name": "DATABASE_USER",
"displayName": "Database user name", "displayName": "Database Username"
"description": "Database user name"
}, },
{ {
"name": "DATABASE_PASSWORD", "name": "DATABASE_PASSWORD",
"displayName": "Database user password", "displayName": "Database User Password"
"description": "Database user password"
}, },
{ {
"name": "APP_CONFIG", "name": "APP_CONFIG",
"displayName": "Application configuration file path", "displayName": "Application Configuration File Path",
"description": "Relative path to Gunicorn configuration file (optional)" "description": "Relative path to Gunicorn configuration file (optional)."
}, },
{ {
"name": "DJANGO_SECRET_KEY", "name": "DJANGO_SECRET_KEY",
"displayName": "Djange secret key", "displayName": "Django Secret Key",
"description": "Set this to a long random string", "description": "Set this to a long random string.",
"generate": "expression", "generate": "expression",
"from": "[\\w]{50}" "from": "[\\w]{50}"
} }