Merge pull request #4 from timogoebel/ou

specify host ou

Author: martencassel

config/realm_ad.yml.example

@@ -5,4 +5,7 @@
 :keytab_path:  /etc/foreman-proxy/realm_ad.keytab
 :principal: realm-proxy@EXAMPLE.COM
 
+# Optional: OU where the machine account shall be placed
+#:ou: OU=Linux,OU=Servers,DC=example,DC=com
+
 :domain_controller: dc.example.com

lib/smart_proxy_realm_ad/configuration_loader.rb

@@ -11,9 +11,10 @@ def load_dependency_injection_wirings(container_instance, settings)
                         settings[:realm],
                         settings[:keytab_path],
                         settings[:principal],
-                        settings[:domain_controller]
+                        settings[:domain_controller],
+                        settings[:ou]
                     )
                 }
         end
     end
-end
+end

lib/smart_proxy_realm_ad/provider.rb

@@ -8,13 +8,14 @@ class Provider
         include Proxy::Util
         include Proxy::Kerberos
 
-        def initialize(realm, keytab_path, principal, domain_controller)
+        def initialize(realm, keytab_path, principal, domain_controller, ou)
             @realm = realm
             @keytab_path = keytab_path
             @principal = principal
             @domain_controller = domain_controller
             @domain = realm.downcase
-            logger.info "Proxy::AdRealm: initialize... #{@realm}, #{@keytab_path}, #{@principal}, #{@domain_controller}, #{@domain}"
+            @ou = ou
+            logger.info "Proxy::AdRealm: initialize... #{@realm}, #{@keytab_path}, #{@principal}, #{@domain_controller}, #{@domain}, #{ou}"
         end
 
         def check_realm realm
@@ -92,6 +93,7 @@ def radcli_join hostfqdn, hostname, password
             enroll = Adcli::AdEnroll.new(@adconn)
             enroll.set_computer_name(hostname)
             enroll.set_host_fqdn(hostfqdn)
+            enroll.set_domain_ou(@ou) if @ou
             enroll.set_computer_password(password)
             enroll.join()
         end
@@ -104,6 +106,7 @@ def radcli_password hostname, password
             # Reset a computer's password
             enroll = Adcli::AdEnroll.new(@adconn)
             enroll.set_computer_name(hostname)
+            enroll.set_domain_ou(@ou) if @ou
             enroll.set_computer_password(password)
             enroll.password()
         end
@@ -112,6 +115,7 @@ def radcli_delete hostname
             # Delete a computer's account
             enroll = Adcli::AdEnroll.new(@adconn)
             enroll.set_computer_name(hostname)
+            enroll.set_domain_ou(@ou) if @ou
             enroll.delete()
         end