Merge remote-tracking branch 'origin/remove-legacy-top-scope-syntax'

ULHPC · Aug 30, 2024 · ec41082 · ec41082
2 parents 1c6457e + 4309092
commit ec41082
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ create those.
 The basic usage is:
 
 ```puppet
-include ::etherpad
+include etherpad
 ```
 
 note that this will use the local DirtyDB and is not recommended beyond basic testing.

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -10,15 +10,15 @@
     default => $etherpad::service_provider,
   }
 
-  contain "::etherpad::service::${svc_provider}"
+  contain "etherpad::service::${svc_provider}"
 
   service { $etherpad::service_name:
     ensure   => $etherpad::service_ensure,
     provider => $svc_provider,
   }
 
   unless $etherpad::ensure == 'absent' {
-    Class["::etherpad::service::${svc_provider}"]
+    Class["etherpad::service::${svc_provider}"]
     -> Service[$etherpad::service_name]
   }
 }
diff --git a/spec/defines/etherpad_plugin_common_spec.rb b/spec/defines/etherpad_plugin_common_spec.rb
@@ -6,7 +6,7 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
-        'include ::etherpad'
+        'include etherpad'
       end
       let(:facts) do
         facts