Commit 744dd590 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

fix type comparison error and add option to not include a backports repo

parent a8a3004b
release/005.001 (2016-12-07) release/005.001 (2016-12-11)
Add "path" attributes to several exec resources. This will be required Add "path" attributes to several exec resources. This will be required
in the next version of Puppet. [adamhl] in the next version of Puppet. [adamhl]
...@@ -12,11 +12,14 @@ release/005.001 (2016-12-07) ...@@ -12,11 +12,14 @@ release/005.001 (2016-12-07)
[puppetclient] Remove some conditional code that made sense when we [puppetclient] Remove some conditional code that made sense when we
used very old versions of Puppet. [adamhl] used very old versions of Puppet. [adamhl]
[ssh] More of the instance variable cleanup. [adamhl] [ssh, syslog, xinetd] More instance variable cleanup. [adamhl]
[syslog] More of the instance variable cleanup. [adamhl] [ipmi] When comparing lsbmajdistrelease to a Debian version, convert
lsbmajdistrelease to an integer first (otherwise, get Ruby
error). [adamhl]
[xinetd] More of the instance variable cleanup. [adamhl] [os/debian] Add parameter to allow the option of *not* including the
debian-stanford backports repository in the apt sources. [adamhl]
release/005.000 (2016-11-21) release/005.000 (2016-11-21)
...@@ -55,6 +58,9 @@ release/005.000 (2016-11-21) ...@@ -55,6 +58,9 @@ release/005.000 (2016-11-21)
* apt_cache_tmp_dir. When apt_cache_notin_tmp is true, this is the * apt_cache_tmp_dir. When apt_cache_notin_tmp is true, this is the
directory to use for package scripts. directory to use for package scripts.
[os/debian] Install the stanford-server package (this might trigger a
duplicate resource error if currently installed by other classes).
[postfix/sender] A new type: base::postfix::sender. This is similar to [postfix/sender] A new type: base::postfix::sender. This is similar to
base::postfix::recipient, except it is used to rewrite sender addresses base::postfix::recipient, except it is used to rewrite sender addresses
instead of recipient addresses. instead of recipient addresses.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# #
# $apt_cache_notin_tmp: If you want apt to use a directory other than # $apt_cache_notin_tmp: If you want apt to use a directory other than
# /tmp for its temporary cache, set this parameter to "true". This is needed # /tmp for its temporary cache, set this parameter to "true". This is needed
# if the /tmp partition is set to "noexec" (apt often needs to execture # if the /tmp partition is set to "noexec" (apt often needs to execute
# configuration files as part of an install or uninstall). # configuration files as part of an install or uninstall).
# #
# If $apt_cache_notin_tmp is set to "true" and $apt_cache_directory is # If $apt_cache_notin_tmp is set to "true" and $apt_cache_directory is
...@@ -29,10 +29,18 @@ ...@@ -29,10 +29,18 @@
# NOTE! If you use $apt_cache_tmp_dir to override the default, then you # NOTE! If you use $apt_cache_tmp_dir to override the default, then you
# must have $apt_cache_tmp_dir as a file resource in your own Puppet # must have $apt_cache_tmp_dir as a file resource in your own Puppet
# code, otherwise Puppet will fail. # code, otherwise Puppet will fail.
#
# $debian_stanford_backports: if set to true (the default) will include in
# apt sources the debian-stanford backports repository. There are some
# packages in the debian-stanford backports repository that overlap the
# regular debian repository, so some users may not want to use this extra
# source; in that case, they should set this parameter to false.
# Default: true
class base::os::debian ( class base::os::debian (
$apt_cache_notin_tmp = false, $apt_cache_notin_tmp = false,
$apt_cache_tmp_dir = '/var/cache/apt/tmp' $apt_cache_tmp_dir = '/var/cache/apt/tmp',
$debian_stanford_backports = true
){ ){
include base::newsyslog include base::newsyslog
......
ENABLED=true ENABLED=true
<% if ((@operatingsystem == 'Debian' and @lsbmajdistrelease >= 8) \ <% if ((@operatingsystem == 'Debian' and @lsbmajdistrelease.to_i >= 8) \
or (@operatingsystem == 'Ubuntu' and !@lsbmajdistrelease.split('.')[0].nil? and @lsbmajdistrelease.split('.')[0].to_i >= 14)) or (@operatingsystem == 'Ubuntu' and !@lsbmajdistrelease.split('.')[0].nil? and @lsbmajdistrelease.split('.')[0].to_i >= 14))
%> %>
IPMIEVD_OPTIONS="open daemon" IPMIEVD_OPTIONS="open daemon"
......
...@@ -24,7 +24,8 @@ deb-src http://debian.stanford.edu/debian-stanford <%= dist %> main non-free con ...@@ -24,7 +24,8 @@ deb-src http://debian.stanford.edu/debian-stanford <%= dist %> main non-free con
# The Stanford restricted Debian archive and source tree. # The Stanford restricted Debian archive and source tree.
deb http://debian.stanford.edu/debian-local <%= dist %> main non-free contrib deb http://debian.stanford.edu/debian-local <%= dist %> main non-free contrib
deb-src http://debian.stanford.edu/debian-local <%= dist %> main non-free contrib deb-src http://debian.stanford.edu/debian-local <%= dist %> main non-free contrib
<% if @lsbdistcodename == 'wheezy' || @lsbdistcodename == 'jessie' || @operatingsystem == 'Ubuntu' -%> <% if (@debian_stanford_backports) &&
(@lsbdistcodename == 'wheezy' || @lsbdistcodename == 'jessie' || @operatingsystem == 'Ubuntu') -%>
# Additional Stanford-local backports. # Additional Stanford-local backports.
deb http://debian.stanford.edu/debian-stanford <%= dist %>-backports main non-free contrib deb http://debian.stanford.edu/debian-stanford <%= dist %>-backports main non-free contrib
......
Markdown is supported
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