Commit 47ce606a authored by Victor Penso's avatar Victor Penso
Browse files

Disable customization of Apache for Debian 8 deployments

parent 631e6f67
......@@ -2,9 +2,9 @@ name "cernvm-fs"
maintainer "GSI, HPC Department"
maintainer_email "hpc@gsi.de"
license "Apache 2.0"
description "Deploy and configure CernVM-FS clients and servers."
description "Deploy and configure CernVM-FS clients and servers."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.1.0"
version "0.1.1"
depends "sys"
depends "apache2", "~> 1.8"
supports "debian", ">= 7.0"
......@@ -3,7 +3,7 @@
#
# Author Victor Penso
#
# Copyright 2013, GSI, HPC Department
# Copyright 2013-2015, GSI, HPC Department
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -18,18 +18,24 @@
# limitations under the License.
case node.platform_version
when /^8/
package 'cvmfs-server'
end
when /^7.*/
include_recipe 'apache2'
include_recipe 'apache2::mod_rewrite'
include_recipe 'apache2::mod_expires'
include_recipe 'apache2'
include_recipe 'apache2::mod_rewrite'
include_recipe 'apache2::mod_expires'
apache_site "000-default" do
enable false
end
when /^8.*/
# There is no need for a specific Apache configuration,
# Debian default configuration is sufficient...
package 'cvmfs-server'
apache_site "000-default" do
enable false
end
# Initialize the repositories unless they exist
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment