Merge remote-tracking branch 'github/pull/165'

[chef.git] / cookbooks / yournavigation / recipes / default.rb

diff --git a/cookbooks/yournavigation/recipes/default.rb b/cookbooks/yournavigation/recipes/default.rb
index 4d4580186d6676e7bc89d913244c2a66eadd2050..c3b249a5e4ab3289ae87b77724c5f1c990f85c6e 100644 (file)
--- a/cookbooks/yournavigation/recipes/default.rb
+++ b/cookbooks/yournavigation/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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
+#     https://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,
@@ -19,30 +19,31 @@
 
 include_recipe "apache"
 
-package "php5"
-package "php5-cli"
+package %w[
+  php
+  php-cli
+  php-apcu
+]
 
-package "php-apc"
-
-#Required for osmosis
+# Required for osmosis
 package "default-jre-headless"
 
-#Required for building gosmore
-package "build-essential"
-package "libxml2-dev"
-package "libgtk2.0-dev"
-package "subversion"
-package "libcurl4-gnutls-dev"
-package "libgps-dev"
-package "libcurl3"
-package "buffer"
-package "git"
-package "cmake"
-package "libqt4-core"
-package "libqt4-dev"
-package "qt4-dev-tools"
-package "qt4-linguist-tools"
-package "libicu52"
-
-apache_module "php5"
+# Required for building gosmore
+package %w[
+  build-essential
+  libxml2-dev
+  libgtk2.0-dev
+  subversion
+  libcurl4-gnutls-dev
+  libgps-dev
+  libcurl4
+  buffer
+  git
+  cmake
+  libqt4-dev
+  qt4-dev-tools
+  qt4-linguist-tools
+  libicu-dev
+]
 
+apache_module "php7.2"