Fixes #26199 - Fix dependency cycle when using git_repo

Previously this resulted in a dependency cycle. The tests didn't compile
so didn't catch it.

    dependency cycles found: (File[/opt/puppetlabs/puppet/cache] => Class[Puppet::Server::Install] => Class[Puppet::Server::Config] => File[/opt/puppetlabs/puppet] => File[/opt/puppetlabs/puppet/cache])

a61e010 introduced this by managing
$sharedir in puppet::server::config. $vardir was managed in
puppet::server::install. Since sharedir is actually
/opt/puppetlabs/puppet and vardir is the cache directory within that, it
created a cycle.

Author: ekohl

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,
-    }
-  }
 }

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