diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/authconfig.rb (renamed from lib/puppet/network/server/authconfig.rb) | 2 | ||||
| -rwxr-xr-x | lib/puppet/network/authstore.rb (renamed from lib/puppet/network/server/authstore.rb) | 0 | ||||
| -rwxr-xr-x | lib/puppet/network/rights.rb (renamed from lib/puppet/network/server/rights.rb) | 2 | ||||
| -rw-r--r-- | lib/puppet/network/server.rb | 5 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/network/server/authconfig.rb b/lib/puppet/network/authconfig.rb index e4d31d8d8..bf21fb5ce 100644 --- a/lib/puppet/network/server/authconfig.rb +++ b/lib/puppet/network/authconfig.rb @@ -1,5 +1,5 @@ require 'puppet/util/loadedfile' -require 'puppet/network/server/rights' +require 'puppet/network/rights' module Puppet class ConfigurationError < Puppet::Error; end diff --git a/lib/puppet/network/server/authstore.rb b/lib/puppet/network/authstore.rb index 51ce93d46..51ce93d46 100755 --- a/lib/puppet/network/server/authstore.rb +++ b/lib/puppet/network/authstore.rb diff --git a/lib/puppet/network/server/rights.rb b/lib/puppet/network/rights.rb index 11da3b705..970a7aacf 100755 --- a/lib/puppet/network/server/rights.rb +++ b/lib/puppet/network/rights.rb @@ -1,5 +1,5 @@ require 'ipaddr' -require 'puppet/network/server/authstore' +require 'puppet/network/authstore' # Define a set of rights and who has access to them. class Puppet::Network::Rights < Hash diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb index e9205d48b..3f19a88ff 100644 --- a/lib/puppet/network/server.rb +++ b/lib/puppet/network/server.rb @@ -191,8 +191,9 @@ module Puppet end end -require 'puppet/network/server/authstore' -require 'puppet/network/server/authconfig' +require 'puppet/network/authstore' +require 'puppet/network/authconfig' +require 'puppet/network/rights' require 'puppet/network/server/servlet' require 'puppet/network/server/master' require 'puppet/network/server/ca' |