[MediaWiki-commits] [Gerrit] ::apache: delete everything we're not already using - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: ::apache: delete everything we're not already using
..
::apache: delete everything we're not already using
Someone at PuppetLabs is getting paid by the line.
Change-Id: I2f558c88a62a70c877ce441ae73c913577077e75
---
D modules/apache/CHANGELOG
D modules/apache/Modulefile
D modules/apache/README.md
D modules/apache/Rakefile
D modules/apache/manifests/dev.pp
D modules/apache/manifests/mod/auth_kerb.pp
D modules/apache/manifests/mod/disk_cache.pp
D modules/apache/manifests/php.pp
D modules/apache/manifests/proxy.pp
D modules/apache/manifests/python.pp
D modules/apache/manifests/ssl.pp
M modules/apache/manifests/vhost/proxy.pp
D modules/apache/spec/classes/apache_spec.rb
D modules/apache/spec/classes/dev_spec.rb
D modules/apache/spec/classes/mod/auth_kerb_spec.rb
D modules/apache/spec/classes/mod/python_spec.rb
D modules/apache/spec/classes/mod/ssl_spec.rb
D modules/apache/spec/classes/mod/wsgi_spec.rb
D modules/apache/spec/classes/params_spec.rb
D modules/apache/spec/classes/php_spec.rb
D modules/apache/spec/classes/python_spec.rb
D modules/apache/spec/classes/ssl_spec.rb
D modules/apache/spec/defines/mod_spec.rb
D modules/apache/spec/defines/vhost/proxy_spec.rb
D modules/apache/spec/defines/vhost/redirect_spec.rb
D modules/apache/spec/defines/vhost_spec.rb
D modules/apache/spec/spec.opts
D modules/apache/spec/spec_helper.rb
D modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
D modules/apache/templates/mod/disk_cache.conf.erb
D modules/apache/templates/test.vhost.erb
D modules/apache/tests/apache.pp
D modules/apache/tests/dev.pp
D modules/apache/tests/init.pp
D modules/apache/tests/php.pp
D modules/apache/tests/vhost.pp
36 files changed, 1 insertion(+), 953 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Andrew Bogott: Looks good to me, but someone else must approve
diff --git a/modules/apache/CHANGELOG b/modules/apache/CHANGELOG
deleted file mode 100644
index 7a7185a..000
--- a/modules/apache/CHANGELOG
+++ /dev/null
@@ -1,42 +0,0 @@
-2012-08-24 Release 0.4.0
-Changes:
-- `include apache` is now required when using apache::mod::*
-
-Bugfixes:
-- Fix syntax for validate_re
-- Fix formatting in vhost template
-- Fix spec tests such that they pass
-
-2012-05-08 Puppet Labs - 0.0.4
-e62e362 Fix broken tests for ssl, vhost, vhost::*
-42c6363 Changes to match style guide and pass puppet-lint without error
-42bc8ba changed name => path for file resources in order to name namevar by
it's name
-72e13de One end too much
-0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be
$::operatingsystem, etc.
-273f94d fix tests
-a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-98d774e (#13860) Autorequire Package['httpd']
-05fcec5 (#13073) Add missing puppet spec tests
-541afda (#6899) Remove virtual a2mod definition
-976cb69 (#13072) Move mod python and wsgi package names to params
-323915a (#13060) Add .gitignore to repo
-fdf40af (#13060) Remove pkg directory from source tree
-fd90015 Add LICENSE file and update the ModuleFile
-d3d0d23 Re-enable local php class
-d7516c7 Make management of firewalls configurable for vhosts
-60f83ba Explicitly lookup scope of apache_name in templates.
-f4d287f (#12581) Add explicit ordering for vdir directory
-88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-a776a8b (#11071) Fix to work with latest firewall module
-2b79e8b (#11070) Add support for Scientific Linux
-405b3e9 Fix for a2mod
-57b9048 Commit apache::vhost::redirect Manifest
-8862d01 Commit apache::vhost::proxy Manifest
-d5c1fd0 Commit apache::mod::wsgi Manifest
-a825ac7 Commit apache::mod::python Manifest
-b77062f Commit Templates
-9a51b4a Vhost File Declarations
-6cf7312 Defaults for Parameters
-6a5b11a Ensure installed
-f672e46 a2mod fix
-8a56ee9 add pthon support to apache
diff --git a/modules/apache/Modulefile b/modules/apache/Modulefile
deleted file mode 100644
index d051348..000
--- a/modules/apache/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-apache'
-version '0.4.0'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/modules/apache/README.md b/modules/apache/README.md
deleted file mode 100644
index 9e8b5e5..000
--- a/modules/apache/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-Puppetlabs module for Apache
-
-
-Apache is widely-used web server and this module will allow to configure
-various modules and setup virtual hosts with minimal effort.
-
-Basic usage
-
-To install Apache
-
-class {'apache': }
-
-To inst
[MediaWiki-commits] [Gerrit] ::apache: delete everything we're not already using - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/137884
Change subject: ::apache: delete everything we're not already using
..
::apache: delete everything we're not already using
Someone at PuppetLabs is getting paid by the line.
Change-Id: I2f558c88a62a70c877ce441ae73c913577077e75
---
D modules/apache/CHANGELOG
D modules/apache/Modulefile
D modules/apache/README.md
D modules/apache/Rakefile
D modules/apache/manifests/dev.pp
D modules/apache/manifests/mod/auth_kerb.pp
D modules/apache/manifests/mod/disk_cache.pp
D modules/apache/manifests/php.pp
D modules/apache/manifests/proxy.pp
D modules/apache/manifests/python.pp
D modules/apache/manifests/ssl.pp
M modules/apache/manifests/vhost/proxy.pp
D modules/apache/spec/classes/apache_spec.rb
D modules/apache/spec/classes/dev_spec.rb
D modules/apache/spec/classes/mod/auth_kerb_spec.rb
D modules/apache/spec/classes/mod/python_spec.rb
D modules/apache/spec/classes/mod/ssl_spec.rb
D modules/apache/spec/classes/mod/wsgi_spec.rb
D modules/apache/spec/classes/params_spec.rb
D modules/apache/spec/classes/php_spec.rb
D modules/apache/spec/classes/python_spec.rb
D modules/apache/spec/classes/ssl_spec.rb
D modules/apache/spec/defines/mod_spec.rb
D modules/apache/spec/defines/vhost/proxy_spec.rb
D modules/apache/spec/defines/vhost/redirect_spec.rb
D modules/apache/spec/defines/vhost_spec.rb
D modules/apache/spec/spec.opts
D modules/apache/spec/spec_helper.rb
D modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
D modules/apache/templates/mod/disk_cache.conf.erb
D modules/apache/tests/apache.pp
D modules/apache/tests/dev.pp
D modules/apache/tests/init.pp
D modules/apache/tests/php.pp
D modules/apache/tests/vhost.pp
35 files changed, 1 insertion(+), 935 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/137884/1
diff --git a/modules/apache/CHANGELOG b/modules/apache/CHANGELOG
deleted file mode 100644
index 7a7185a..000
--- a/modules/apache/CHANGELOG
+++ /dev/null
@@ -1,42 +0,0 @@
-2012-08-24 Release 0.4.0
-Changes:
-- `include apache` is now required when using apache::mod::*
-
-Bugfixes:
-- Fix syntax for validate_re
-- Fix formatting in vhost template
-- Fix spec tests such that they pass
-
-2012-05-08 Puppet Labs - 0.0.4
-e62e362 Fix broken tests for ssl, vhost, vhost::*
-42c6363 Changes to match style guide and pass puppet-lint without error
-42bc8ba changed name => path for file resources in order to name namevar by
it's name
-72e13de One end too much
-0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be
$::operatingsystem, etc.
-273f94d fix tests
-a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-98d774e (#13860) Autorequire Package['httpd']
-05fcec5 (#13073) Add missing puppet spec tests
-541afda (#6899) Remove virtual a2mod definition
-976cb69 (#13072) Move mod python and wsgi package names to params
-323915a (#13060) Add .gitignore to repo
-fdf40af (#13060) Remove pkg directory from source tree
-fd90015 Add LICENSE file and update the ModuleFile
-d3d0d23 Re-enable local php class
-d7516c7 Make management of firewalls configurable for vhosts
-60f83ba Explicitly lookup scope of apache_name in templates.
-f4d287f (#12581) Add explicit ordering for vdir directory
-88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-a776a8b (#11071) Fix to work with latest firewall module
-2b79e8b (#11070) Add support for Scientific Linux
-405b3e9 Fix for a2mod
-57b9048 Commit apache::vhost::redirect Manifest
-8862d01 Commit apache::vhost::proxy Manifest
-d5c1fd0 Commit apache::mod::wsgi Manifest
-a825ac7 Commit apache::mod::python Manifest
-b77062f Commit Templates
-9a51b4a Vhost File Declarations
-6cf7312 Defaults for Parameters
-6a5b11a Ensure installed
-f672e46 a2mod fix
-8a56ee9 add pthon support to apache
diff --git a/modules/apache/Modulefile b/modules/apache/Modulefile
deleted file mode 100644
index d051348..000
--- a/modules/apache/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-apache'
-version '0.4.0'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/modules/apache/README.md b/modules/apache/README.md
deleted file mode 100644
index 9e8b5e5..000
--- a/modules/apache/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-Puppetlabs module for Apache
-
-
-Apache is widely-used web server and this module will allow to configure
-various modules and setup virtual hosts with minimal effort.
-
-Basic usage
-
-To install Apache
-
-class {'apache': }
-
-To install the Apache PHP module
-
-class {'apache::
