httpd_configmap_generator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e0604454a0d955b16cf177a9d4342cfb73e513
-  data.tar.gz: b69bcd86f4599c5198cbf5fde4c2a58f6d1c4df1
+  metadata.gz: 7404d7526e62a24e10b417fa31d73b4023b1eb71
+  data.tar.gz: 3a3587bac420ca0c2349d838a6c248b24d3cbade
 SHA512:
-  metadata.gz: 0aff3baa827b66b0cc27958994f43be0015b543bd3e8e161ad169799aa4730276dd9b84a48820d90b865917bb8137eea2549a9b7748e97913e7a9df603b16a32
-  data.tar.gz: 38b9b7a162478059c6523a964b67a5fd50c222ac8df884d378b8a6b48dc0433f82ccdbcd493fc97b61fa781e19d6c9158e0efbabe4072977c04078e925419a10
+  metadata.gz: cf984ea9aa2d30ff1d36de0b0b20aad9f2e70a5a7f89e63d9c0cf3db0cf4cc951319c9687874f016a9699c44e6dc44ad729727ca23943e065bb77056ef2b6e68
+  data.tar.gz: 8fd7d31aba466446da43b81a13d34bd44b724d55f3cd0bc24f8fb00185a58f86dc047f8a0b7ba5f875907fb72765d8f4d19c2036669f4b83c8c44a3beab255cd

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-- '2.3.1'
-- '2.4.2'
+- 2.3.6
+- 2.4.2
 sudo: false
 cache: bundler
 after_script: bundle exec codeclimate-test-reporter

data/README.md

@@ -260,8 +260,6 @@ ___
 
 ### Pre-deployment tasks
 
-#### If running without OCI systemd hooks (Minishift)
-
 The httpd-configmap-generator service account must be added to the httpd-scc-sysadmin SCC before the Httpd Configmap Generator can run.
 
 ##### As Admin
@@ -285,22 +283,6 @@ $ oc describe scc httpd-scc-sysadmin | grep Users
 Users:        system:serviceaccount:<your-namespace>:httpd-configmap-generator
 ```
 
-#### If running  with OCI systemd hooks
-
-##### As Admin
-
-```
-$ oc adm policy add-scc-to-user anyuid system:serviceaccount:<your-namespace>:httpd-configmap-generator
-```
-
-Verify that the httpd-configmap-generator service account is included in the anyuid SCC:
-
-```
-$ oc describe scc anyuid | grep Users
-Users:        system:serviceaccount:<your-namespace>:httpd-configmap-generator
-```
-
-
 ### Deploy the Httpd Configmap Generator Application
 
 As basic user
@@ -341,20 +323,20 @@ $ CONFIGMAP_GENERATOR_POD=`oc get pods | grep "httpd-configmap-generator" | cut
 ### Generating a configmap for external authentication against IPA
 
 ```
-$ oc rsh $CONFIGMAP_GENERATOR_POD httpd_configmap_generator ipa ...
+$ oc exec $CONFIGMAP_GENERATOR_POD  -- bash -c 'httpd_configmap_generator ipa ...
 ```
 
 Example configuration:
 
 ```
-$ oc rsh $CONFIGMAP_GENERATOR_POD httpd_configmap_generator ipa \
+$ oc exec $CONFIGMAP_GENERATOR_POD -- bash -c 'httpd_configmap_generator ipa \
     --host=appliance.example.com        \
     --ipa-server=ipaserver.example.com  \
     --ipa-domain=example.com            \
     --ipa-realm=EXAMPLE.COM             \
     --ipa-principal=admin               \
     --ipa-password=smartvm1             \
-    -o /tmp/external-ipa.yaml
+    -o /tmp/external-ipa.yaml'
 ```
 
 `--host` above must be the DNS of the application exposing the httpd auth pod,

data/lib/httpd_configmap_generator/active_directory.rb

@@ -34,10 +34,8 @@ module HttpdConfigmapGenerator
         /etc/pam.d/postlogin-ac
         /etc/pam.d/smartcard-auth-ac
         /etc/pam.d/system-auth-ac
-        /etc/resolv.conf
         /etc/sssd/sssd.conf
         /etc/sysconfig/authconfig
-        /etc/sysconfig/network
       )
     end
 

data/lib/httpd_configmap_generator/ipa.rb

@@ -1,3 +1,5 @@
+require "socket"               
+
 module HttpdConfigmapGenerator
   class Ipa < Base
     IPA_INSTALL_COMMAND  = "/usr/sbin/ipa-client-install".freeze
@@ -49,6 +51,7 @@ module HttpdConfigmapGenerator
     end
 
     def configure(opts)
+      opts[:host] = get_canonical_hostname(opts[:host])
       update_hostname(opts[:host])
       command_run!(IPA_INSTALL_COMMAND,
                    :params => [
@@ -118,5 +121,11 @@ module HttpdConfigmapGenerator
       FileUtils.chown(APACHE_USER, nil, HTTP_KEYTAB)
       FileUtils.chmod(0o600, HTTP_KEYTAB)
     end
+
+    def get_canonical_hostname(hostname)
+      Socket.gethostbyname(hostname)[0]
+    rescue SocketError
+      hostname
+    end
   end
 end

data/lib/httpd_configmap_generator/ldap.rb

@@ -55,8 +55,7 @@ module HttpdConfigmapGenerator
          /etc/pam.d/smartcard-auth-ac
          /etc/pam.d/system-auth-ac
          /etc/sssd/sssd.conf
-         /etc/sysconfig/authconfig
-         /etc/sysconfig/network) + [opts[:cert_file]]
+         /etc/sysconfig/authconfig) + [opts[:cert_file]]
     end
 
     def configure(opts)

data/lib/httpd_configmap_generator/version.rb

@@ -1,3 +1,3 @@
 module HttpdConfigmapGenerator
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpd_configmap_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Httpd Auth Config Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The Httpd Configmap Generator