Skip to content

Address foodcritic #9

Merged
merged 6 commits into from Feb 7, 2013
View
2 .gitignore
@@ -1,2 +1,4 @@
Gemfile.lock
tmp/
+*.swp
+.rvmrc
View
7 attributes/default.rb
@@ -18,8 +18,7 @@
# limitations under the License.
#
-default['drupal']['version'] = "7.14"
-default['drupal']['checksum'] = "17db094aaa78d76ec6a3517171f1d8c158745eee2e19006d5ed97b7ffc2c54da"
+default['drupal']['version'] = "7.18"
default['drupal']['dir'] = "/var/www/drupal"
default['drupal']['db']['database'] = "drupal"
default['drupal']['db']['user'] = "drupal"
@@ -34,8 +33,8 @@
set_unless['drupal']['db']['password'] = secure_password
default['drupal']['src'] = Chef::Config[:file_cache_path]
-default['drupal']['drush']['version'] = "7.x-5.4"
-default['drupal']['drush']['checksum'] = "6cea1275f2aad22b8d3474bb34b4494f069f823feecccb7edb399631f0b0ca40"
+default['drupal']['drush']['version'] = "7.x-5.8"
+default['drupal']['drush']['checksum'] = "15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480"
default['drupal']['drush']['dir'] = "/usr/local/drush"
default['drupal']['modules'] = ["views", "webform"]
View
1 metadata.rb
@@ -1,6 +1,7 @@
maintainer "Promet Solutions"
maintainer_email "marius@promethost.com"
license "Apache 2.0"
+name "drupal"
description "Installs/Configures drupal"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "1.1.1"
View
4 recipes/default.rb
@@ -41,7 +41,7 @@
:database => node['drupal']['db']['database'],
:host => node['drupal']['db']['host']
)
- notifies :run, resources(:execute => "mysql-install-drupal-privileges"), :immediately
+ notifies :run, "execute[mysql-install-drupal-privileges]", :immediately
end
execute "create #{node['drupal']['db']['database']} database" do
@@ -94,5 +94,5 @@
execute "disable-default-site" do
command "sudo a2dissite default"
- notifies :reload, resources(:service => "apache2"), :delayed
+ notifies :reload, "service[apache2]", :delayed
end
View
6 recipes/drush.rb
@@ -42,9 +42,3 @@
link "/usr/local/bin/drush" do
to "#{node['drupal']['drush']['dir']}/drush"
end
-
-#execute "install-drush-make" do
-# cwd node['drupal']['drush']['dir']
-# command "/usr/local/bin/drush dl drush_make"
-# not_if { File.directory?("/root/.drush/drush_make")}
-#end
Something went wrong with that request. Please try again.