From: Tom Hughes Date: Thu, 27 Mar 2014 19:21:15 +0000 (+0000) Subject: Drop the drupal cookbook X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e3e9c005f2054e595f3c735af096ceb5c3a1d785?hp=ad81220e82b6e2abc9e32dc5653aebe66db1d48c Drop the drupal cookbook --- diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index d9a4a63f5..84b03a0f0 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -78,11 +78,6 @@ apt_source "brianmercer-php" do key "8D0DC64F" end -apt_source "aw-drupal" do - url "http://ppa.launchpad.net/aw/drupal/ubuntu" - key "7D5AE8F6" -end - apt_source "openstreetmap" do url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu" key "0AC4F2CB" diff --git a/cookbooks/drupal/README.md b/cookbooks/drupal/README.md deleted file mode 100644 index 205739199..000000000 --- a/cookbooks/drupal/README.md +++ /dev/null @@ -1,34 +0,0 @@ -Cookbook -======== -TODO: Enter the cookbook description here. - -e.g. -This cookbook makes your favorite breakfast sandwich. - -Requirements ------------- -TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc. - -Attributes ----------- -TODO: List you cookbook attributes here. - -Usage ------ -TODO: Write usage instructions for each cookbook. - -Contributing ------------- -TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section. - -e.g. -1. Fork the repository on Github -2. Create a named feature branch (like `add_component_x`) -3. Write your change -4. Write tests for your change (if applicable) -5. Run the tests, ensuring they all pass -6. Submit a Pull Request using Github - -License and Authors -------------------- -Authors: TODO: List authors diff --git a/cookbooks/drupal/attributes/default.rb b/cookbooks/drupal/attributes/default.rb deleted file mode 100644 index efa6d7dc4..000000000 --- a/cookbooks/drupal/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -default[:apt][:sources] |= [ "aw-drupal" ] diff --git a/cookbooks/drupal/definitions/drupal_site.rb b/cookbooks/drupal/definitions/drupal_site.rb deleted file mode 100644 index 41e0b73c0..000000000 --- a/cookbooks/drupal/definitions/drupal_site.rb +++ /dev/null @@ -1,82 +0,0 @@ -# -# Cookbook Name:: drupal -# Definition:: drupal_site -# -# Copyright 2011, OpenStreetMap Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -define :drupal_site, :action => [ :create ], :variables => {} do - site_name = params[:name] - site_action = params[:action] - site_title = params[:title] || site_name - short_name = site_name.sub(/\..*$/, "") - db_name = params[:database_name] || short_name - db_username = params[:database_username] || short_name - db_password = params[:database_password] - db_url = "mysql://#{db_username}:#{db_password}@localhost/#{db_name}" - admin_username = params[:admin_username] || "admin" - admin_password = params[:admin_password] - admin_email = params[:admin_email] || "webmaster@openstreetmap.org" - ssl = params[:ssl] || false - - if site_action.include?(:create) - directory "/data/#{site_name}" do - owner "www-data" - group "www-data" - mode "0775" - recursive true - end - - directory "/data/#{site_name}/files" do - owner "www-data" - group "www-data" - mode "0775" - end - - directory "/data/#{site_name}/private" do - owner "www-data" - group "www-data" - mode "0775" - end - - directory "/etc/drupal/7/sites/#{site_name}" do - owner "root" - group "root" - mode "0555" - end - - link "/etc/drupal/7/sites/#{site_name}/files" do - to "/data/#{site_name}/files" - end - - link "/etc/drupal/7/sites/#{site_name}/private" do - to "/data/#{site_name}/private" - end - - execute "drupal-site-install-#{short_name}" do - command "drush site-install --account-name=#{admin_username} --account-pass=#{admin_password} --account-mail=#{admin_email} --db-url=#{db_url} --site-name=#{site_title} --site-mail=webmaster@openstreetmap.org --sites-subdir=#{site_name} --yes" - cwd "/usr/share/drupal7" - user "root" - group "root" - creates "/etc/drupal/7/sites/#{site_name}/settings.php" - end - - apache_site site_name do - cookbook "drupal" - template ssl ? "apache-ssl.erb" : "apache.erb" - end - elsif site_action.include?(:delete) - end -end diff --git a/cookbooks/drupal/metadata.rb b/cookbooks/drupal/metadata.rb deleted file mode 100644 index 9aefe736b..000000000 --- a/cookbooks/drupal/metadata.rb +++ /dev/null @@ -1,8 +0,0 @@ -name "drupal" -maintainer "OpenStreetMap Administrators" -maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" -description "Installs and configures Drupal" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "1.0.0" -depends "apache" diff --git a/cookbooks/drupal/recipes/default.rb b/cookbooks/drupal/recipes/default.rb deleted file mode 100644 index a1294743d..000000000 --- a/cookbooks/drupal/recipes/default.rb +++ /dev/null @@ -1,25 +0,0 @@ -# -# Cookbook Name:: drupal -# Recipe:: default -# -# Copyright 2011, OpenStreetMap Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include_recipe "apache::ssl" - -package "drupal7" -package "drush" - -apache_module "php5" diff --git a/cookbooks/drupal/templates/default/apache-ssl.erb b/cookbooks/drupal/templates/default/apache-ssl.erb deleted file mode 100644 index 03aa5eebe..000000000 --- a/cookbooks/drupal/templates/default/apache-ssl.erb +++ /dev/null @@ -1,23 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - - - ServerName <%= @name %> - ServerAdmin webmaster@openstreetmap.org - - CustomLog /var/log/apache2/<%= @name %>-access.log combined - ErrorLog /var/log/apache2/<%= @name %>-error.log - - RedirectPermanent / https://<%= @name %>/ - - - - ServerName <%= @name %> - ServerAdmin webmaster@openstreetmap.org - - CustomLog /var/log/apache2/<%= @name %>-access.log combined - ErrorLog /var/log/apache2/<%= @name %>-error.log - - DocumentRoot /usr/share/drupal7 - - SSLEngine on - diff --git a/cookbooks/drupal/templates/default/apache.erb b/cookbooks/drupal/templates/default/apache.erb deleted file mode 100644 index f1947c49a..000000000 --- a/cookbooks/drupal/templates/default/apache.erb +++ /dev/null @@ -1,11 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - - - ServerName <%= @name %> - ServerAdmin webmaster@openstreetmap.org - - CustomLog /var/log/apache2/<%= @name %>-access.log combined - ErrorLog /var/log/apache2/<%= @name %>-error.log - - DocumentRoot /usr/share/drupal7 -