Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

El compatible #41

Merged
merged 8 commits into from
Feb 3, 2015
Merged

El compatible #41

merged 8 commits into from
Feb 3, 2015

Commits on Apr 4, 2014

  1. Remve hardcoded path /etc/bind and use param instead 

    - Split some parameters as named.conf could be in another place on some systems
- include dns::server::params when needed (puppet lint says it's a bad idea to
  inherit it)
- Align some symbols (=> or =)
- Make some requirement more readable
    Benoît Marcelin committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    1879953 View commit details
    Browse the repository at this point in the history

  2. Add EL (tested on CentOS) support

    Benoît Marcelin committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    a9e36f4 View commit details
    Browse the repository at this point in the history

  3. Fix dns::server::options, generates a 400 on puppet 3.4 

    - Use include of params instead inherit them
- Remove useless requirements (parent dir)
    Benoît Marcelin committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    49ab400 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. Merge branch 'master' into el-compatible 

    Conflicts:
	manifests/server/options.pp
    Benoît Marcelin committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    9ff6e8d View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2014

  1. Ensure that an osfamily is defined in tests

    Benoît Marcelin committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    47bf912 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into el-compatible

    Benoît Marcelin committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    2b7c520 View commit details
    Browse the repository at this point in the history

  3. Fix an insidious merge conflict

    Benoît Marcelin committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    b4d1966 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2014

  1. Merge remote-tracking branch 'ajjahn/master' into el-compatible 

    Conflicts:
	manifests/key.pp
	manifests/record.pp
	manifests/server/config.pp
	manifests/server/params.pp
	manifests/zone.pp
	spec/defines/dns__acl_spec.rb
	spec/defines/dns_zone_spec.rb
    Benoît Marcelin committed May 21, 2014
    Configuration menu
    Copy the full SHA
    743a689 View commit details
    Browse the repository at this point in the history