From c409e5880b6a386363eb960a43ac57f1fc343634 Mon Sep 17 00:00:00 2001 From: Bastian Schwarz Date: Thu, 17 Dec 2020 18:51:07 +0100 Subject: [PATCH 1/2] Also deleted attributes since they are not used anymore --- attributes/5.6.rb | 18 ------------------ attributes/7.1.rb | 18 ------------------ attributes/7.2.rb | 17 ----------------- attributes/7.3.rb | 17 ----------------- attributes/7.4.rb | 17 ----------------- attributes/add_sury_repository.rb | 3 --- attributes/default.rb | 4 ---- chefignore | 5 ++++- 8 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 attributes/5.6.rb delete mode 100644 attributes/7.1.rb delete mode 100644 attributes/7.2.rb delete mode 100644 attributes/7.3.rb delete mode 100644 attributes/7.4.rb delete mode 100644 attributes/add_sury_repository.rb delete mode 100644 attributes/default.rb diff --git a/attributes/5.6.rb b/attributes/5.6.rb deleted file mode 100644 index bbf3ff1..0000000 --- a/attributes/5.6.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['5.6']['package_name'] = 'php5.6-cli' -default['codenamephp_php']['5.6']['additional_packages'] = [ - 'php5.6-bcmath', - 'php5.6-curl', - 'php5.6-gd', - 'php5.6-json', - 'php5.6-mcrypt', - 'php5.6-mbstring', - 'php5.6-mysql', - 'php5.6-tidy', - 'php5.6-xml', - 'php5.6-xsl', - 'php5.6-xmlrpc', - 'php5.6-zip', - 'php-imagick', -] diff --git a/attributes/7.1.rb b/attributes/7.1.rb deleted file mode 100644 index 5536488..0000000 --- a/attributes/7.1.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['7.1']['package_name'] = 'php7.1-cli' -default['codenamephp_php']['7.1']['additional_packages'] = [ - 'php7.1-bcmath', - 'php7.1-curl', - 'php7.1-gd', - 'php7.1-json', - 'php7.1-mcrypt', - 'php7.1-mbstring', - 'php7.1-mysql', - 'php7.1-tidy', - 'php7.1-xml', - 'php7.1-xsl', - 'php7.1-xmlrpc', - 'php7.1-zip', - 'php-imagick', -] diff --git a/attributes/7.2.rb b/attributes/7.2.rb deleted file mode 100644 index c20e9d4..0000000 --- a/attributes/7.2.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['7.2']['package_name'] = 'php7.2-cli' -default['codenamephp_php']['7.2']['additional_packages'] = [ - 'php7.2-bcmath', - 'php7.2-curl', - 'php7.2-gd', - 'php7.2-json', - 'php7.2-mbstring', - 'php7.2-mysql', - 'php7.2-tidy', - 'php7.2-xml', - 'php7.2-xsl', - 'php7.2-xmlrpc', - 'php7.2-zip', - 'php-imagick', -] diff --git a/attributes/7.3.rb b/attributes/7.3.rb deleted file mode 100644 index 18c72b3..0000000 --- a/attributes/7.3.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['7.3']['package_name'] = 'php7.3-cli' -default['codenamephp_php']['7.3']['additional_packages'] = [ - 'php7.3-bcmath', - 'php7.3-curl', - 'php7.3-gd', - 'php7.3-json', - 'php7.3-mbstring', - 'php7.3-mysql', - 'php7.3-tidy', - 'php7.3-xml', - 'php7.3-xsl', - 'php7.3-xmlrpc', - 'php7.3-zip', - 'php-imagick', -] diff --git a/attributes/7.4.rb b/attributes/7.4.rb deleted file mode 100644 index 748ecd4..0000000 --- a/attributes/7.4.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['7.4']['package_name'] = 'php7.4-cli' -default['codenamephp_php']['7.4']['additional_packages'] = [ - 'php7.4-bcmath', - 'php7.4-curl', - 'php7.4-gd', - 'php7.4-json', - 'php7.4-mbstring', - 'php7.4-mysql', - 'php7.4-tidy', - 'php7.4-xml', - 'php7.4-xsl', - 'php7.4-xmlrpc', - 'php7.4-zip', - 'php-imagick', -] diff --git a/attributes/add_sury_repository.rb b/attributes/add_sury_repository.rb deleted file mode 100644 index 9e1f917..0000000 --- a/attributes/add_sury_repository.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['add_sury_repository'] = true diff --git a/attributes/default.rb b/attributes/default.rb deleted file mode 100644 index 1004a5f..0000000 --- a/attributes/default.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -default['codenamephp_php']['install_composer'] = true -default['codenamephp_php']['install_xdebug'] = true diff --git a/chefignore b/chefignore index b19c377..7823d74 100644 --- a/chefignore +++ b/chefignore @@ -2,10 +2,13 @@ # or sharing to the community site. # Lines that start with '# ' are comments. +chefignore *.pem *.pem.enc .travis.yml .chef +.rubocop +.typo-ci.yml # OS generated files # ###################### @@ -88,7 +91,7 @@ CONTRIBUTING CHANGELOG* TESTING* MAINTAINERS.toml -.kitchen*.yml +kitchen*.yml *.pem # Strainer # From 1a5ef845a864b3b7334703b1c4437581604aefa3 Mon Sep 17 00:00:00 2001 From: Bastian Schwarz Date: Thu, 17 Dec 2020 17:55:12 +0000 Subject: [PATCH 2/2] [CHANGELOG] Updated changelog Signed-off-by: Bastian Schwarz --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ea4fb2..77c5487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Merged pull requests:** +- Also deleted attributes since they are not used anymore [\#39](https://github.com/codenamephp/chef.cookbook.php/pull/39) ([bastianschwarz](https://github.com/bastianschwarz)) - Removed recipes [\#37](https://github.com/codenamephp/chef.cookbook.php/pull/37) ([bastianschwarz](https://github.com/bastianschwarz)) - Removed XDebug 2 [\#36](https://github.com/codenamephp/chef.cookbook.php/pull/36) ([bastianschwarz](https://github.com/bastianschwarz))