Revert "[COOK-3418] - Virtual Domain Support"

This reverts commit d6bec0d04547048ad5a514ab63c105eed499fab8.

.kitchen.cloud.yml

@@ -1,162 +0,0 @@
----
-driver_config:
-  digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
-  digitalocean_api_key: <%= ENV['DIGITAL_OCEAN_API_KEY'] %>
-  google_client_email: <%= ENV['GOOGLE_CLIENT_EMAIL'] %>
-  google_key_location: <%= ENV['GOOGLE_KEY_LOCATION'] %>
-  google_project: <%= ENV['GOOGLE_PROJECT'] %>
-  joyent_username: <%= ENV['SDC_CLI_ACCOUNT'] %>
-  joyent_keyfile: <%= ENV['SDC_CLI_IDENTITY'] %>
-  joyent_keyname: <%= ENV['SDC_CLI_KEY_ID'] %>
-  joyent_url: <%= ENV['SDC_CLI_URL'] %>
-  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
-  aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
-  aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
-  availability_zone: <%= ENV['AWS_AVAILABILITY_ZONE'] %>
-
-provisioner:
-  name: chef_zero
-  require_chef_omnibus: 11.12.8
-
-platforms:
-- name: centos-5.8
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 1601
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-    ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-
-- name: centos-6.5
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 3448641
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-    ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-
-- name: amazon-2013.09
-  driver_plugin: ec2
-  driver_config:
-    image_id: ami-3be4bc52
-    username: ec2-user
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-
-- name: amazon-2014.03
-  driver_plugin: ec2
-  driver_config:
-    image_id: ami-6b726502
-    username: ec2-user
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-
-# - name: fedora-19
-#   driver_plugin: digitalocean
-#   driver_config:
-#     image_id: 3102879
-#     flavor_id: 63
-#     region_id: 4
-#     ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-#     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-
-- name: debian-7.0
-  driver_plugin: gce
-  driver_config:
-    image_name: debian-7-wheezy-v20131120
-    zone: <%= ENV['GCE_ZONE'] %>
-    area: <%= ENV['GCE_AREA'] %>
-    network: <%= ENV['GCE_NETWORK'] %>
-    username: <%= ENV['GCE_USERNAME'] %>
-    public_key_path: <%= ENV['GCE_PUBLIC_KEY_PATH'] %>
-    ssh_key: <%= ENV['GCE_SSH_KEY_PATH'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-10.04
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 14097
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-    ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-12.04
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 3101045
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-    ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-  run_list:
-  - recipe[apt]
-
-- name: ubuntu-14.04
-  driver_plugin: digitalocean
-  driver_config:
-    image_id: 3240036
-    flavor_id: 63
-    region_id: 4
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
-    ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
-  run_list:
-  - recipe[apt]
-
-- name: smartos-13.4.0
-  driver_plugin: joyent
-  driver_config:
-    joyent_image_id: ff86eb8a-a069-11e3-ae0e-4f3c8983a91c
-    joyent_flavor_id: g3-standard-4-smartos
-    username: root
-    ssh_key: <%= ENV['SDC_CLI_IDENTITY'] %>
-  busser:
-    ruby_bindir: '/opt/local/bin/'
-  provisioner:
-    name: chef_zero
-    sudo: false
-    chef_omnibus_url: https://raw.github.com/test-kitchen/kitchen-joyent/master/scripts/install-smartos.sh
-
-- name: omnios-151006
-  driver_plugin: ec2
-  driver_config:
-    image_id: ami-35eb835c
-    flavor_id: m3.medium
-    username: root
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-  provisioner:
-    name: chef_zero
-  run_list:
-  - recipe[ips-omniti]
-
-suites:
-- name: default
-  run_list:
-  - recipe[postfix]
-  attributes: {}
-
-- name: aliases
-  run_list:
-  - recipe[postfix::aliases]
-  attributes: {}
-
-- name: client
-  run_list:
-  - recipe[postfix::client]
-  attributes: {}
-
-- name: server
-  run_list:
-  - recipe[postfix::server]
-  attributes: {}
-
-- name: sasl_auth
-  run_list:
-  - recipe[postfix::sasl_auth]
-  attributes:
-    postfix:
-      main :
-        smtp_sasl_auth_enable: "yes"

Gemfile

@@ -1,41 +1,12 @@
 source 'https://rubygems.org'
 
-group :lint do
+gem 'strainer'
+gem 'berkshelf',  '~> 2.0'
+gem 'chefspec',   '~> 3.0'
 gem 'foodcritic', '~> 3.0'
-  gem 'rubocop', '~> 0.18'
+gem 'rubocop',    '~> 0.14'
-  gem 'rainbow', '< 2.0'
-end
 
-group :unit do
+group :integration do
-  gem 'berkshelf',  '~> 3.1'
+  gem 'test-kitchen',    '~> 1.1.0'
-  gem 'chefspec',   '~> 3.4'
+  gem 'kitchen-vagrant', '~> 0.14'
-end
-
-group :kitchen_common do
-  gem 'test-kitchen', '~> 1.2'
-end
-
-group :kitchen_vagrant do
-  gem 'kitchen-vagrant', '~> 0.11'
-end
-
-group :kitchen_cloud do
-  gem 'kitchen-digitalocean'
-  gem 'kitchen-ec2'
-  gem 'kitchen-joyent'
-  gem 'kitchen-gce'
-end
-
-group :development do
-  gem 'ruby_gntp'
-  gem 'growl'
-  gem 'rb-fsevent'
-  gem 'guard', '~> 2.4'
-  gem 'guard-kitchen'
-  gem 'guard-foodcritic'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'rake'
-  gem 'fauxhai'
-  gem 'pry-nav'
 end

attributes/default.rb

@@ -131,9 +131,3 @@ end
 
 # Master.cf attributes
 default['postfix']['master']['submission'] = false
-
-default['postfix']['virtual']['virtual_aliases'] = {}
-unless node['postfix']['virtual']['virtual_aliases'].empty?
-  default['postfix']['main']['virtual_alias_domains'] = ''
-  default['postfix']['main']['virtual_alias_maps']    = 'hash:/etc/postfix/virtual'
-end

recipes/virtual.rb

@@ -1,31 +0,0 @@
-# Author:: Braden Wright(<bwright@hwahomewarranty.com>)
-# Cookbook Name:: postfix
-# Recipe:: default
-#
-# Copyright 2009-2012, Opscode, Inc.
-#
-# 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 "postfix"
-
-execute "update-postfix-virtual" do
-  command "postmap /etc/postfix/virtual"
-  action :nothing
-end
-
-template "/etc/postfix/virtual" do
-  source "virtual.erb"
-  notifies :run, 'execute[update-postfix-virtual]'
-end
-

templates/default/virtual.erb

@@ -1,6 +0,0 @@
-# This file was created by Chef for <%= node['fqdn'] %>
-# Do NOT modify this file by hand!
-
-<% node['postfix']['virtual']['virtual_aliases'].each do |from, to| %>
-<%= from %> <%= to %>
-<% end %>