summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2009-06-04 15:34:48 -0700
committerAdam Jacob <adam@opscode.com>2009-06-04 15:34:48 -0700
commit45c7246419d17a80cdf9900a514c085478b1196f (patch)
treedb9a71e16b8a71d41c584dab15647b68062f1d3b
parent6d9022bf71908bcb743fb25c12fcf0e95c1a5e82 (diff)
downloadchef-45c7246419d17a80cdf9900a514c085478b1196f.tar.gz
Updating the openid_consumer index to have a link to the wiki
-rw-r--r--chef-server-slice/app/views/openid_consumer/index.html.haml6
-rw-r--r--example-repository/cookbooks/fakefile/metadata.json22
-rw-r--r--example-repository/cookbooks/tempfile/metadata.json22
3 files changed, 26 insertions, 24 deletions
diff --git a/chef-server-slice/app/views/openid_consumer/index.html.haml b/chef-server-slice/app/views/openid_consumer/index.html.haml
index 52bbca72a8..c714f6ed03 100644
--- a/chef-server-slice/app/views/openid_consumer/index.html.haml
+++ b/chef-server-slice/app/views/openid_consumer/index.html.haml
@@ -1,7 +1,9 @@
- unless Chef::Config[:openid_providers]
- throw_content(:sidebar_block_notice) do
%h4 Where do I get a Login?
- %p Chef uses OpenID for user logins. By default, Chef allows you to use any OpenID provider you like. You should configure the server to utilize only trusted OpenID servers and URIs.This box will disappear when you have altered the default security configuration.
+ %p Chef uses OpenID for user logins. By default, Chef allows you to use any OpenID provider you like. You should configure the server to utilize only trusted OpenID servers and URIs. This box will disappear when you have altered the default security configuration.
+ %p= link_to("How to secure your Chef Server on the Chef Wiki.", "http://wiki.opscode.com/display/chef/Securing+Chef+Server")
+
.block#block-forms
.content
%h2.title Login
@@ -18,4 +20,4 @@
.group
.check_box= check_box :name => "force_post", :label => "Force the transaction to POST", :value => "0"
.group.navform
- .button= submit "Login &rarr;" \ No newline at end of file
+ .button= submit "Login &rarr;"
diff --git a/example-repository/cookbooks/fakefile/metadata.json b/example-repository/cookbooks/fakefile/metadata.json
index 93bc5937cc..2853384d0f 100644
--- a/example-repository/cookbooks/fakefile/metadata.json
+++ b/example-repository/cookbooks/fakefile/metadata.json
@@ -1,13 +1,11 @@
{
- "recommendations": {
-
- },
"maintainer_email": "youremail@example.com",
"suggestions": {
},
- "recipes": {
- "fakefile": ""
+ "license": "Apache v2.0",
+ "conflicting": {
+
},
"dependencies": {
"tempfile": [
@@ -17,13 +15,9 @@
]
},
- "license": "Apache v2.0",
"attributes": {
},
- "conflicting": {
-
- },
"name": "fakefile",
"providing": {
"fakefile": [
@@ -35,8 +29,14 @@
},
"long_description": "",
"description": "A fabulous new cookbook",
- "platforms": {
+ "recipes": {
+ "fakefile": ""
+ },
+ "maintainer": "Your Name",
+ "recommendations": {
},
- "maintainer": "Your Name"
+ "platforms": {
+
+ }
} \ No newline at end of file
diff --git a/example-repository/cookbooks/tempfile/metadata.json b/example-repository/cookbooks/tempfile/metadata.json
index c97773ead3..ef7a0e3d08 100644
--- a/example-repository/cookbooks/tempfile/metadata.json
+++ b/example-repository/cookbooks/tempfile/metadata.json
@@ -1,26 +1,20 @@
{
- "recommendations": {
-
- },
"maintainer_email": "youremail@example.com",
"suggestions": {
},
- "recipes": {
- "tempfile": ""
+ "license": "Apache v2.0",
+ "conflicting": {
+
},
"dependencies": {
"fakefile": [
]
},
- "license": "Apache v2.0",
"attributes": {
},
- "conflicting": {
-
- },
"name": "tempfile",
"providing": {
"tempfile": [
@@ -32,8 +26,14 @@
},
"long_description": "",
"description": "A fabulous new cookbook",
- "platforms": {
+ "recipes": {
+ "tempfile": ""
+ },
+ "maintainer": "Your Name",
+ "recommendations": {
},
- "maintainer": "Your Name"
+ "platforms": {
+
+ }
} \ No newline at end of file