7 files changed, 23 insertions, 21 deletions

diff --git a/net/foreman-proxy/files/patch-bin-smart-proxy b/net/foreman-proxy/files/patch-bin-smart-proxy
index 167ba1b59a3f..d85df17df24c 100644
--- a/net/foreman-proxy/files/patch-bin-smart-proxy
+++ b/net/foreman-proxy/files/patch-bin-smart-proxy
@@ -1,10 +1,10 @@
---- bin/smart-proxy.orig	2014-12-04 11:24:23.964747068 +0100
-+++ bin/smart-proxy	2014-12-04 11:24:26.244762141 +0100
+--- bin/smart-proxy.orig	2017-05-08 15:18:42 UTC
++++ bin/smart-proxy
 @@ -1,6 +1,7 @@
  #!/usr/bin/env ruby
  
  $LOAD_PATH.unshift(*Dir[File.expand_path("../../lib", __FILE__), File.expand_path("../../modules", __FILE__)])
 +$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"])
  
- require 'smart_proxy'
+ require 'smart_proxy_main'
  Proxy::Launcher.new.launch
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
index c00278e90590..78544b2d4bf3 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
@@ -1,5 +1,5 @@
---- config/settings.d/puppetca.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
-+++ config/settings.d/puppetca.yml.example	2016-09-05 23:43:16.509994000 +0200
+--- config/settings.d/puppetca.yml.example.orig	2017-05-08 15:18:42 UTC
++++ config/settings.d/puppetca.yml.example
 @@ -2,7 +2,7 @@
  # Can be true, false, or http/https to enable just one of the protocols
  :enabled: false
diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
deleted file mode 100644
index a24cad590744..000000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/settings.d/realm.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
-+++ config/settings.d/realm.yml.example	2016-09-05 23:44:35.005749000 +0200
-@@ -7,7 +7,7 @@
- #:realm_provider: freeipa
- 
- # Authentication for Kerberos-based Realms
--:realm_keytab: /etc/foreman-proxy/freeipa.keytab
-+:realm_keytab: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab
- :realm_principal: realm-proxy@EXAMPLE.COM
- 
- # FreeIPA specific settings
diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
new file mode 100644
index 000000000000..2fe5f1da9cd5
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
@@ -0,0 +1,13 @@
+--- config/settings.d/realm_freeipa.yml.example.orig	2017-05-08 15:18:42 UTC
++++ config/settings.d/realm_freeipa.yml.example
+@@ -1,8 +1,8 @@
+ ---
+ # Authentication for Kerberos-based Realms
+-:keytab_path: /etc/foreman-proxy/freeipa.keytab
++:realm_keytab: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab
+ :principal: realm-proxy@EXAMPLE.COM
+ 
+-:ipa_config: /etc/ipa/default.conf
++:ipa_config: %%LOCALBASE%%/etc/ipa/default.conf
+ # Remove from DNS when deleting the FreeIPA entry
+ :remove_dns: true
diff --git a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
index 0763e6d6a8ef..350598f0599c 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
@@ -1,5 +1,5 @@
---- config/settings.d/tftp.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
-+++ config/settings.d/tftp.yml.example	2016-09-05 23:44:01.480711000 +0200
+--- config/settings.d/tftp.yml.example.orig	2017-05-08 15:18:42 UTC
++++ config/settings.d/tftp.yml.example
 @@ -2,6 +2,6 @@
  # Can be true, false, or http/https to enable just one of the protocols
  :enabled: false
diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example
index 2a23656a61f7..bf15c6366d0e 100644
--- a/net/foreman-proxy/files/patch-config-settings.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.yml.example
@@ -1,5 +1,5 @@
---- config/settings.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
-+++ config/settings.yml.example	2016-09-05 23:33:49.472857000 +0200
+--- config/settings.yml.example.orig	2017-05-08 15:18:42 UTC
++++ config/settings.yml.example
 @@ -38,7 +38,7 @@
  #:foreman_ssl_key: ssl/private_keys/fqdn.pem
  
diff --git a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
index 75553d989f69..6c44f49c45a8 100644
--- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
+++ b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
@@ -1,4 +1,4 @@
---- lib/proxy/http_download.rb.orig	2015-12-24 23:13:02 UTC
+--- lib/proxy/http_download.rb.orig	2017-05-08 15:18:42 UTC
 +++ lib/proxy/http_download.rb
 @@ -6,7 +6,7 @@ module Proxy