X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cff9dcae835b91819b00d702e054f9d485e4fb85..c6902ea9afba17351101f28b4a401e5193b89c1b:/cookbooks/forum/recipes/default.rb diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb index 58fa9a22d..3e2b97d8e 100644 --- a/cookbooks/forum/recipes/default.rb +++ b/cookbooks/forum/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, @@ -16,23 +16,26 @@ # See the License for the specific language governing permissions and # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "git" include_recipe "mysql" passwords = data_bag_item("forum", "passwords") -package "php" -package "php-cli" -package "php-mysql" -package "php-xml" -package "php-apcu" +package %w[ + php + php-cli + php-mysql + php-xml + php-apcu +] -apache_module "php7.0" +apache_module "php7.2" apache_module "rewrite" -apache_site "default" do - action [:disable] +ssl_certificate "forum.openstreetmap.org" do + domains ["forum.openstreetmap.org", "forum.osm.org"] + notifies :reload, "service[apache2]" end apache_site "forum.openstreetmap.org" do