| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
|
|
Prior to this commit, upgrading from puppet=2.7.23-1~deb7u3 and
puppetmaster=2.7.23-1~deb7u3 to puppet=3.7.0.29-1puppetlabs1 and
puppetmaster=3.7.0.29-1puppetlabs1 fails. I believe this problem is due
to how Debian chose to package puppet-common, which owns
`/usr/share/man/man8/puppet-master.8.gz`.
This commit adds in a `Conflicts:` to the puppetmaster and
puppetmaster-common packages to make sure that we can successfully
upgrade from these older package versions. However, if a user has
puppetmaster and puppet older than 3.3.0 installed on a machine, and
only upgrades puppetmaster, this will uninstall the puppet package from
the system.
|
|
|
|
For redhat and debian, we create and manage a $statedir with ownership
set to puppet:puppet. Unfortuntely, we also create a $reportsdir that is
owned by root. This means that other applications, even those in the
puppet group, could not write to this directory. This commits adds the
$reportsdir to both debian and redhat packaging to ensure it is created
with the correct permissions (just at the $statedir is), to ensure a
more consistent experience for users of our packages.
|
|
haus/ticket/master/pup-3035-add-var-run-puppet-to-debian-packaging
(PUP-3035) Add /var/run/puppet to debian packaging
|
|
In 6a94700, the rgen 0.7.0 library was added to the vendor directory in puppet,
and as such is no longer an external dependency. This commit removes the rgen
package as a dependency of the puppet rpm and deb packages, so that it is not
installed in addition to the vendored rgen (or worse even installed at a
conflicting version).
Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
|
|
This commit does some simple refactoring int he puppet-common.postinst
to avoid some unneeded repetition.
|
|
Previously /var/run/puppet was created only during service start on
debian for both puppet and puppetmaster services. However, as it is used
in both of those services, it makes sense to have it owned and created
by one of the puppet packages. puppet-common is a dependency of both the
puppet and puppetmaster packages, so this commit adds /var/run/puppet to
the puppet-common.dirs file so it will be created in that package. This
also brings parity between redhat and debian packages in this respect,
as redhat puppet packages create the /var/run/puppet directory already.
This also adds a dpkg-statoverride call to manage permissions for the
/var/run/puppet directory.
|
|
Currently, upgrades from 2.7.26 to 3.6.2 break because of a file
conflict. It seems that as of Puppet 3.3.0, the manpages changed from
being owned by the puppet package, to being owned by the puppet-common
package. This change was initially done to allow upgrades from Debian
packages to ours. However, changing which package owns a given file
makes upgrades difficult. This commit adds in conflicts to allow smooth
upgrades from puppet packages prior to the manpage change to the current
version.
|
|
|
|
|
|
In Apache 2.2, if either the SSLCARevocationFile or SSLCARevocationPath
directives were specified then the specified file(s) would be checked
when establishing an SSL connection. Apache 2.4+ the
SSLCARevocationCheck directive was added to control how CRLs were
checked when verifying a connection and had a default value of none.
This means that Apache defaults to ignoring CRLs even if paths are
specified to CRL files.
This commit updates the debian postinst script for the
puppetmaster-passenger package to set SSLCARevocationCheck directive to
'chain' when Apache 2.4 is installed. This ensures that the the
puppetmaster-passenger vhost respects CRL files in the same way that
Apache 2.2 does by default.
Apache 2.2
|
|
|
|
|
|
Passenger 4 deprecated and removed several vhost directives, which would
break installations of the package on platforms with passenger 4. This
commit adds a condional sed call to delete those directives if the
passenger version is 4 or greater.
|
|
This commit brings over a change from the debian puppet packaging to
move all of the sed calls in to one sed invocation and to use a tempfile
instead of operating directly on the live apache vhost file.
|
|
In httpd 2.4 some of the conventions around a2ensite changed which broke
the postinst and postrm scripts. This commit brings in several changes from the
debian puppet packaging that have addressed this problem. An
apache2_puppetmaster_sitename function is used to determine the correct
sitename to use in sites-available. Thanks to Stig Sandbeck Mathisen for
the work in the debian puppet packaging.
|
|
The postinst of the puppetmaster-passenger depends on the a2*
binaries to configure the package. This dependency moved from the
apache2-common package into the main apache2 package, so this commit
adds apache2 as a dependency of the puppetmaster-passenger package.
|
|
|
|
|
|
The previous commits relied on automatic creation of parent directories.
This explicitly calls out each directory, which brings the debs in line
with how the rpms are expressed.
|
|
This adds the example environment for the RPM packages. See the previous
commit for an explanation about why environments are being added to
packages in this manner.
This also moves the README.environment into a shared location so that it
can be kept the same between various packaging systems.
|
|
This adds an /etc/puppet/environments/example_env directory,
subdirectories, and a README about the environment. We can't remove the
existing /etc/puppet/manifests directory because it would destroy a
large number of deployments (anyone with automation depending on that
directory being created). We also can't create a production environment
because it would then shadow the /etc/puppet/manifests directory and
also end up breaking automation as well as any existing regular
installations. The example environment with a README seems to be the
best way to move forward and try to present the new system to users.
|
|
Conflicts:
ext/debian/control
|
|
anymore
But as Ubuntu Lucid does, we still leave thoses as optionnals
|
|
By requiring hiera in install.rb, we force this as a build dependency of puppet
for any platform that depends on install.rb to build packages. This commit
updates debian and redhat packaging to have a build dependency on hiera to
satisfy this requirement.
Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
|
|
In the Debian 'testing' release, the libopenssl-ruby virtual package has been
replaced with the libopenssl-ruby1.9.1 virtual package. The control
file for Debian packages has been updated to reflect this.
|
|
We're starting to rely on facts that were released in Facter 1.7.0,
which means that we always need to pull in 1.7 to make those facts
available.
|
|
|
|
In order to have the v2 api emit and consume JSON puppet will need to
have access to a json library. This adds it to our dependencies for
debian, redhat, and gem packages. This should be a safe thing to do
since puppet already needs hiera and hiera depends on JSON, so this is
just taking the same dependency that hiera already had and applying it
directly to puppet.
|
|
|
|
|
|
|
|
|
|
In a previous commit, files in ext/rack/files were moved up a directory to
ext/rack and some files were renamed. Among the renamed files was
apache2.conf, which was renamed to example-passenger-vhost.conf. This caused
the rules evaluation to fail, which caused debian packaging to fail. This
commit addresses that by renaming the vhost references in the debian/rules
file.
|
|
In a previous commit, files in ext/rack/files were moved up a directory to
ext/rack and some unneeded files were removed. Among the removed files was
README, which was unfortunately still used in the debian/rules file as a
supplemental doc for the puppetmaster-passenger package. The lack of
ext/rack/README caused the rules evaluation to fail, which caused debian
packaging to fail. This commit addresses that by removing the README references
from the debian/rules file.
|
|
As updated in commit 4c9b63f, the sample files for rack passenger deployment
have been moved up a directory. The puppetmaster-passenger package for debian
uses those files, so this commit updates the debian/rules file with their new
location. It also updates the README_DEVELOPER.md, which references the same
files.
|
|
The reasoning for this is explained in:
https://projects.puppetlabs.com/issues/23033
Currently the init-script does not actually check if we're running and
return accordingly when status is called if the puppet master is not
configured to start.
This causes it to always return 0, meaning we're actually running
regardless of if that is the case.
|
|
|
|
|
|
|
|
|
|
* upstream/stable:
(Maint) Don't prefetch from /tmp/test
(#19727) Collapse multiple leading slashes
(packaging) Update PUPPETVERSION for 3.2.3-rc1
(packaging) Remove Ubuntu Oneiric from build targets
(#21264) Update rgen dependency to 0.6.5
(packaging) Use the packaging loader for tasks
|
|
Commit ec6b51a8ded9245df9606a57d53674c62bddc11e updated the rgen dependency in
the Gemfile. This commit makes the same dependency explicit in the various
packages (deb, rpm, gem). We pin the version hard at 0.6.5 to prevent potential
breakages with future versions of rgen.
|
|
|
|
This mirrors Debian's packaging and allows upgrades from their packages to
ours.
|
|
|
|
|
|
This commit reorders the ruby dependencies of Puppet, listing the generic
version agnostic package first, followed by a ruby 1.9.1 package, followed by a
ruby1.8 package.
|
