Skip to content

Make the cookbook easier to wrap #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vanders wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make the cookbook easier to wrap #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b55153
Don't use set_unless
Vanders May 23, 2016
3834a79
Use normal attributes
Vanders May 24, 2016
4a19554
Attribute to control DB installation
Vanders May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
default['wordpress']['db']['port'] = '3306' # Must be a string
default['wordpress']['db']['charset'] = 'utf8'
default['wordpress']['db']['collate'] = ''
default['wordpress']['db']['install'] = true
case node['platform']
when 'ubuntu'
case node['platform_version']
Expand Down Expand Up @@ -101,3 +102,12 @@
end

default['wordpress']['php_options'] = { 'php_admin_value[upload_max_filesize]' => '50M', 'php_admin_value[post_max_size]' => '55M' }

default['wordpress']['keys']['auth'] = nil
default['wordpress']['keys']['secure_auth'] = nil
default['wordpress']['keys']['logged_in'] = nil
default['wordpress']['keys']['nonce'] = nil
default['wordpress']['salt']['auth'] = nil
default['wordpress']['salt']['secure_auth'] = nil
default['wordpress']['salt']['logged_in'] = nil
default['wordpress']['salt']['nonce'] = nil
2 changes: 1 addition & 1 deletion libraries/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
module Wordpress
module Helpers
def is_local_host?(host)
if host == 'localhost' || host == '127.0.0.1' || host == '::1'
if host == 'localhost' || host == '127.0.0.1' || host == '::1' || host =~ /\Alocalhost:.*\z/
true
else
require 'socket'
Expand Down
16 changes: 8 additions & 8 deletions recipes/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
include_recipe "wordpress::database"

::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
node.set_unless['wordpress']['keys']['auth'] = secure_password
node.set_unless['wordpress']['keys']['secure_auth'] = secure_password
node.set_unless['wordpress']['keys']['logged_in'] = secure_password
node.set_unless['wordpress']['keys']['nonce'] = secure_password
node.set_unless['wordpress']['salt']['auth'] = secure_password
node.set_unless['wordpress']['salt']['secure_auth'] = secure_password
node.set_unless['wordpress']['salt']['logged_in'] = secure_password
node.set_unless['wordpress']['salt']['nonce'] = secure_password
node.normal['wordpress']['keys']['auth'] = secure_password unless node['wordpress']['keys']['auth']
node.normal['wordpress']['keys']['secure_auth'] = secure_password unless node['wordpress']['keys']['secure_auth']
node.normal['wordpress']['keys']['logged_in'] = secure_password unless node['wordpress']['keys']['logged_in']
node.normal['wordpress']['keys']['nonce'] = secure_password unless node['wordpress']['keys']['nonce']
node.normal['wordpress']['salt']['auth'] = secure_password unless node['wordpress']['salt']['auth']
node.normal['wordpress']['salt']['secure_auth'] = secure_password unless node['wordpress']['salt']['secure_auth']
node.normal['wordpress']['salt']['logged_in'] = secure_password unless node['wordpress']['salt']['logged_in']
node.normal['wordpress']['salt']['nonce'] = secure_password unless node['wordpress']['salt']['nonce']
node.save unless Chef::Config[:solo]

directory node['wordpress']['dir'] do
Expand Down
4 changes: 2 additions & 2 deletions recipes/database.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
::Chef::Recipe.send(:include, Wordpress::Helpers)

node.set_unless['wordpress']['db']['pass'] = secure_password
node.normal['wordpress']['db']['pass'] = secure_password unless node['wordpress']['db']['pass']
node.save unless Chef::Config[:solo]

db = node['wordpress']['db']

if is_local_host? db['host']
if is_local_host? db['host'] and db['install']

# The following is required for the mysql community cookbook to work properly
include_recipe 'selinux::disabled' if node['platform_family'] == 'rhel'
Expand Down
4 changes: 2 additions & 2 deletions recipes/nginx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# limitations under the License.
#

node.set_unless['php-fpm']['pools'] = []
node.normal['php-fpm']['pools'] = [] unless node['php-fpm']['pools']

include_recipe "php-fpm"

Expand All @@ -36,7 +36,7 @@

include_recipe "php::module_mysql"

node.set_unless['nginx']['default_site_enabled'] = false
node.normal['nginx']['default_site_enabled'] = false unless node['nginx']['default_site_enabled']
include_recipe "nginx"

include_recipe "wordpress::app"
Expand Down