CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [11.0.1](https://github.com/theforeman/puppet-puppet/tree/11.0.1) (2019-04-02)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/11.0.0...11.0.1)
+
+**Fixed bugs:**
+
+- Fixes [\#26199](https://projects.theforeman.org/issues/26199) - Fix dependency cycle when using git\_repo [\#682](https://github.com/theforeman/puppet-puppet/pull/682) ([ekohl](https://github.com/ekohl))
+- Quick fix for Windows agent restart loop \#678 [\#679](https://github.com/theforeman/puppet-puppet/pull/679) ([anthonysomerset](https://github.com/anthonysomerset))
+
 ## [11.0.0](https://github.com/theforeman/puppet-puppet/tree/11.0.0) (2019-01-14)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/10.1.0...11.0.0)
@@ -11,6 +20,7 @@
 - Remove dynamic and config environments [\#653](https://github.com/theforeman/puppet-puppet/pull/653) ([ekohl](https://github.com/ekohl))
 - Remove passenger support [\#650](https://github.com/theforeman/puppet-puppet/pull/650) ([ekohl](https://github.com/ekohl))
 - Drop support for puppetserver \< 2.7 [\#649](https://github.com/theforeman/puppet-puppet/pull/649) ([ekohl](https://github.com/ekohl))
+- namespace extlib functions [\#639](https://github.com/theforeman/puppet-puppet/pull/639) ([mmoll](https://github.com/mmoll))
 
 **Implemented enhancements:**
 
@@ -19,10 +29,10 @@
 - Config file updates and FreeBSD refactorings [\#664](https://github.com/theforeman/puppet-puppet/pull/664) ([mmoll](https://github.com/mmoll))
 - Set more data types and document classes & defines [\#663](https://github.com/theforeman/puppet-puppet/pull/663) ([ekohl](https://github.com/ekohl))
 - Add unmanaged Puppet Agent runmode [\#659](https://github.com/theforeman/puppet-puppet/pull/659) ([Rathios](https://github.com/Rathios))
-- namespace extlib functions [\#639](https://github.com/theforeman/puppet-puppet/pull/639) ([mmoll](https://github.com/mmoll))
 
 **Merged pull requests:**
 
+- Release 11.0.0 [\#669](https://github.com/theforeman/puppet-puppet/pull/669) ([ekohl](https://github.com/ekohl))
 - add Puppetserver 5.x upgrade test [\#667](https://github.com/theforeman/puppet-puppet/pull/667) ([mmoll](https://github.com/mmoll))
 
 ## [10.1.0](https://github.com/theforeman/puppet-puppet/tree/10.1.0) (2018-12-06)

manifests/config.pp

@@ -75,7 +75,9 @@
   }
   -> case $::osfamily {
     'Windows': {
-      concat { "${puppet_dir}/puppet.conf": }
+      concat { "${puppet_dir}/puppet.conf":
+        mode  => '0674',
+      }
     }
 
     default: {

manifests/server/config.pp

@@ -232,18 +232,25 @@
   }
 
   if $::puppet::server::git_repo {
-    # need to chown the $vardir before puppet does it, or else
-    # we can't write puppet.git/ on the first run
-
     include ::git
 
+    if $::puppet::server::manage_user {
+      Class['git'] -> User[$::puppet::server::user]
+    }
+
+    file { $::puppet::vardir:
+      ensure => directory,
+      owner  => 'root',
+      group  => 'root',
+    }
+
     git::repo { 'puppet_repo':
       bare    => true,
       target  => $::puppet::server::git_repo_path,
       mode    => $::puppet::server::git_repo_mode,
       user    => $::puppet::server::git_repo_user,
       group   => $::puppet::server::git_repo_group,
-      require => File[$::puppet::server::envs_dir],
+      require => File[$::puppet::vardir, $::puppet::server::envs_dir],
     }
 
     $git_branch_map = $::puppet::server::git_branch_map

manifests/server/install.pp

@@ -37,14 +37,4 @@
       Package[$server_package] -> User[$::puppet::server::user]
     }
   }
-
-  if $::puppet::server::git_repo {
-    Class['git'] -> User[$::puppet::server::user]
-
-    file { $puppet::vardir:
-      ensure => directory,
-      owner  => $::puppet::server::user,
-      group  => $::puppet::server::group,
-    }
-  }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-puppet",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",

spec/classes/puppet_server_spec.rb

@@ -345,6 +345,8 @@
           super().merge(server_git_repo: true)
         end
 
+        it { is_expected.to compile.with_all_deps }
+
         it do
           should contain_class('puppet::server')
             .with_git_repo(true)
@@ -373,7 +375,7 @@
         it do
           should contain_file(vardir)
             .with_ensure('directory')
-            .with_owner('puppet')
+            .with_owner('root')
         end
 
         it do