Branch: refs/heads/staging
  Home:   https://github.com/jenkins-infra/jenkins-infra
  Commit: ea76b290c0eea72a39748309f7e96d7c319f0074
      
https://github.com/jenkins-infra/jenkins-infra/commit/ea76b290c0eea72a39748309f7e96d7c319f0074
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M dist/profile/manifests/confluence.pp

  Log Message:
  -----------
  fixed a confluence virtual host setting.

vhost_name sets the host name part of <VirtualHost HOST:PORT> directive, which 
makes virtual host only applicable when the request comes through IP address 
that HOST refers to.

Tests failed to catch this because serverspec makes curl call from within, 
which means the request was coming from 127.0.0.1 that host name 
'wiki.jenkins-ci.org' was resolving to on this box.

Also removing "ssl => true" because it tries to set the certificate path & 
server key path. Given the way SSL works, trying to configure such information 
inside VirtualHost really doesn't make sense. See [1] for more info.

I still remain wholly unconvinced about the way puppet handles apache 
configuration files. I'd much rather write a per-site *.conf file directly by 
hand than learning how puppet maps those to parameters and how they get 
translated into the *.conf files. It's neither particularly readable or 
writable. But oh well.

[1] https://wiki.apache.org/httpd/NameBasedSSLVHosts


  Commit: 0aa9a0d09fbcfbb5924f18e9a0f275049addee89
      
https://github.com/jenkins-infra/jenkins-infra/commit/0aa9a0d09fbcfbb5924f18e9a0f275049addee89
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    A hieradata/clients/lettuce.yaml

  Log Message:
  -----------
  lettuce now needs to deploy the SSL key for wiki.jenkins-ci.org


  Commit: df5e4e1aa25b2d47e9f1c7a145c7260b9b79c4fb
      
https://github.com/jenkins-infra/jenkins-infra/commit/df5e4e1aa25b2d47e9f1c7a145c7260b9b79c4fb
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M .fixtures.yml
    M Puppetfile

  Log Message:
  -----------
  datadog-agent specifies ruby 0.2.0 as the dependency.

So to satisfy that constraint, we need to use 0.2.0. According to the
changelog of puppetlabs/ruby, 0.2.0 and 0.2.1 is a metadata-only change,
so this is hopefully OK.


  Commit: 59c17d8f1d5aa081ceb0264b4cb0bf1f2ff6a853
      
https://github.com/jenkins-infra/jenkins-infra/commit/59c17d8f1d5aa081ceb0264b4cb0bf1f2ff6a853
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M dist/profile/manifests/apache-cert.pp

  Log Message:
  -----------
  SSL module needs to be activated explicitly.


Compare: 
https://github.com/jenkins-infra/jenkins-infra/compare/260492b4f1a4...59c17d8f1d5a

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to