vbatts/nodejs-ex
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #37 from gabemontero/onlineMotivatedWordsmithing

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

48
openshift/templates/nodejs-mongodb.json
View file

@ -338,82 +338,80 @@
"parameters": [ "parameters": [
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory limit", "displayName": "Memory Limit",
"description": "Maximum amount of memory the Node.js container can use", "description": "Maximum amount of memory the Node.js container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "MEMORY_MONGODB_LIMIT", "name": "MEMORY_MONGODB_LIMIT",
"displayName": "Memory limit", "displayName": "Memory Limit (MongoDB)",
"description": "Maximum amount of memory the MongoDB container can use", "description": "Maximum amount of memory the MongoDB 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/nodejs-ex.git" "value": "https://github.com/openshift/nodejs-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 Node.js service, if left blank a value will be defaulted.", "description": "The exposed hostname that will route to the Node.js 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": "GENERIC_WEBHOOK_SECRET", "name": "GENERIC_WEBHOOK_SECRET",
"displayName": "Generic webhook secret", "displayName": "Generic Webhook Secret",
"description": "A secret string used to configure the Generic webhook", "description": "A secret string used to configure the Generic 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": "mongodb" "value": "mongodb"
}, },
{ {
"name": "DATABASE_USER", "name": "DATABASE_USER",
"displayName": "MongoDB user name", "displayName": "MongoDB Username",
"description": "Username for MongoDB user that will be used for accessing the database", "description": "Username for MongoDB user that will be used for accessing the database.",
"generate": "expression", "generate": "expression",
"from": "user[A-Z0-9]{3}" "from": "user[A-Z0-9]{3}"
}, },
{ {
"name": "DATABASE_PASSWORD", "name": "DATABASE_PASSWORD",
"displayName": "MongoDB password", "displayName": "MongoDB Password",
"description": "Password for the MongoDB user", "description": "Password for the MongoDB user.",
"generate": "expression", "generate": "expression",
"from": "[a-zA-Z0-9]{16}" "from": "[a-zA-Z0-9]{16}"
}, },
{ {
"name": "DATABASE_NAME", "name": "DATABASE_NAME",
"displayName": "Database name", "displayName": "Database Name",
"description": "Database name",
"value": "sampledb" "value": "sampledb"
}, },
{ {
"name": "DATABASE_ADMIN_PASSWORD", "name": "DATABASE_ADMIN_PASSWORD",
"displayName": "Database administrator password", "displayName": "Database Administrator Password",
"description": "Password for the database admin user", "description": "Password for the database admin user.",
"generate": "expression", "generate": "expression",
"from": "[a-zA-Z0-9]{16}" "from": "[a-zA-Z0-9]{16}"
} }

44
openshift/templates/nodejs.json
View file

@ -225,70 +225,68 @@
"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/nodejs-ex.git" "value": "https://github.com/openshift/nodejs-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 Node.js service, if left blank a value will be defaulted.", "description": "The exposed hostname that will route to the Node.js 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": "GENERIC_WEBHOOK_SECRET", "name": "GENERIC_WEBHOOK_SECRET",
"displayName": "Generic webhook secret", "displayName": "Generic Webhook Secret",
"description": "A secret string used to configure the Generic webhook", "description": "A secret string used to configure the Generic 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": "MONGODB_USER", "name": "MONGODB_USER",
"displayName": "MongoDB user name", "displayName": "MongoDB Username",
"description": "Username for MongoDB user that will be used for accessing the database" "description": "Username for MongoDB user that will be used for accessing the database."
}, },
{ {
"name": "MONGODB_PASSWORD", "name": "MONGODB_PASSWORD",
"displayName": "MongoDB password", "displayName": "MongoDB Password",
"description": "Password for the MongoDB user" "description": "Password for the MongoDB user."
}, },
{ {
"name": "MONGODB_DATABASE", "name": "MONGODB_DATABASE",
"displayName": "Database name", "displayName": "Database Name"
"description": "Database name"
}, },
{ {
"name": "MONGODB_ADMIN_PASSWORD", "name": "MONGODB_ADMIN_PASSWORD",
"displayName": "Database administrator password", "displayName": "Database Administrator Password",
"description": "Password for the database admin user" "description": "Password for the database admin user."
} }
] ]
} }