diff options
Diffstat (limited to 'net/foreman-proxy/files')
10 files changed, 35 insertions, 58 deletions
diff --git a/net/foreman-proxy/files/foreman-proxy.in b/net/foreman-proxy/files/foreman-proxy.in index e66423c40a20..5f4a4cee9d87 100644 --- a/net/foreman-proxy/files/foreman-proxy.in +++ b/net/foreman-proxy/files/foreman-proxy.in @@ -12,9 +12,11 @@ name="foreman_proxy" rcvar="foreman_proxy_enable" -command="%%PREFIX%%/sbin/smart-proxy" +command="/usr/sbin/daemon" +procname="%%PREFIX%%/sbin/smart-proxy" command_interpreter="%%RUBY%%" pidfile="%%FOREMAN_PROXY_RUNDIR%%/foreman-proxy.pid" +command_args="-p ${pidfile} -t ${procname} ${command_interpreter} ${procname}" foreman_proxy_enable=${foreman_proxy_enable:-"NO"} foreman_proxy_user=${foreman_proxy_user-"%%FOREMAN_PROXY_USER%%"} diff --git a/net/foreman-proxy/files/patch-bin-smart-proxy b/net/foreman-proxy/files/patch-bin-smart-proxy index d85df17df24c..01f0fac5fdc9 100644 --- a/net/foreman-proxy/files/patch-bin-smart-proxy +++ b/net/foreman-proxy/files/patch-bin-smart-proxy @@ -1,9 +1,9 @@ ---- bin/smart-proxy.orig 2017-05-08 15:18:42 UTC +--- 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[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)]) +$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"]) require 'smart_proxy_main' diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example deleted file mode 100644 index 9acd043d62ec..000000000000 --- a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example +++ /dev/null @@ -1,24 +0,0 @@ ---- config/settings.d/puppet_proxy_legacy.yml.example 2018-12-06 13:30:25.000000000 +0100 -+++ config/settings.d/puppet_proxy_legacy.yml.example 2019-02-11 22:22:20.750500000 +0100 -@@ -5,7 +5,7 @@ - # :puppet_version setting in smart-proxy's puppet.yml configuration file. - # - --- --#:puppet_conf: /etc/puppet/puppet.conf -+#:puppet_conf: %%LOCALBASE%%/etc/puppet/puppet.conf - # - # Override use of Puppet's API to list environments, by default it will use only if - # environmentpath is given in puppet.conf, else will look for environments in puppet.conf -@@ -16,9 +16,9 @@ - #:puppet_url: https://puppet.example.com:8140 - # - # SSL certificates used to access the environment API. Required if puppet_use_environment_api is set to true. --#:puppet_ssl_ca: /var/lib/puppet/ssl/certs/ca.pem --#:puppet_ssl_cert: /var/lib/puppet/ssl/certs/puppet.example.com.pem --#:puppet_ssl_key: /var/lib/puppet/ssl/private_keys/puppet.example.com.pem -+#:puppet_ssl_ca: /var/puppet/ssl/certs/ca.pem -+#:puppet_ssl_cert: /var/puppet/ssl/certs/puppet.example.com.pem -+#:puppet_ssl_key: /var/puppet/ssl/private_keys/puppet.example.com.pem - # - # Enable/disable puppet class cache - #:use_cache: true diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example deleted file mode 100644 index ff3ac32eedde..000000000000 --- a/net/foreman-proxy/files/patch-config-settings.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/settings.yml.example.orig 2018-12-06 13:30:25.000000000 +0100 -+++ config/settings.yml.example 2019-02-11 22:25:42.626500000 +0100 -@@ -43,7 +43,7 @@ - #:foreman_ssl_key: ssl/private_keys/fqdn.pem - - # by default smart_proxy runs in the foreground. To enable running as a daemon, uncomment 'daemon' setting --#:daemon: true -+:daemon: true - # Only used when 'daemon' is set to true. - # Uncomment and modify if you want to change the default pid file '/var/run/foreman-proxy/foreman-proxy.pid' - #:daemon_pid: /var/run/foreman-proxy/foreman-proxy.pid diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example b/net/foreman-proxy/files/patch-config_settings.d_puppet__proxy__puppet__api.yml.example index 84cff78da77f..5493d15ada23 100644 --- a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example +++ b/net/foreman-proxy/files/patch-config_settings.d_puppet__proxy__puppet__api.yml.example @@ -1,6 +1,6 @@ ---- config/settings.d/puppet_proxy_puppet_api.yml.example.orig 2018-12-06 13:30:25.000000000 +0100 -+++ config/settings.d/puppet_proxy_puppet_api.yml.example 2019-02-11 22:22:53.410247000 +0100 -@@ -9,9 +9,9 @@ +--- config/settings.d/puppet_proxy_puppet_api.yml.example.orig 2022-09-08 13:50:11 UTC ++++ config/settings.d/puppet_proxy_puppet_api.yml.example +@@ -3,9 +3,9 @@ #:puppet_url: https://puppet.example.com:8140 # # SSL certificates used to access the puppet API diff --git a/net/foreman-proxy/files/patch-config_settings.d_puppetca__hostname__whitelisting.yml.example b/net/foreman-proxy/files/patch-config_settings.d_puppetca__hostname__whitelisting.yml.example new file mode 100644 index 000000000000..4d33a0dac6b4 --- /dev/null +++ b/net/foreman-proxy/files/patch-config_settings.d_puppetca__hostname__whitelisting.yml.example @@ -0,0 +1,8 @@ +--- config/settings.d/puppetca_hostname_whitelisting.yml.example.orig 2022-09-08 13:50:11 UTC ++++ config/settings.d/puppetca_hostname_whitelisting.yml.example +@@ -3,4 +3,4 @@ + # Configuration of the PuppetCA hostname_whitelisting provider + # + +-#:autosignfile: /etc/puppet/autosign.conf ++#:autosignfile: %%LOCALBASE%%/etc/puppet/autosign.conf diff --git a/net/foreman-proxy/files/patch-config_settings.d_puppetca__http__api.yml.example b/net/foreman-proxy/files/patch-config_settings.d_puppetca__http__api.yml.example new file mode 100644 index 000000000000..a1bc798173b9 --- /dev/null +++ b/net/foreman-proxy/files/patch-config_settings.d_puppetca__http__api.yml.example @@ -0,0 +1,12 @@ +--- config/settings.d/puppetca_http_api.yml.example.orig 2022-09-08 13:50:11 UTC ++++ config/settings.d/puppetca_http_api.yml.example +@@ -3,6 +3,6 @@ + #:puppet_url: https://puppet.example.com:8140 + # + # SSL certificates used to access the CA API. +-#:puppet_ssl_ca: /etc/puppetlabs/ssl/certs/ca.pem +-#:puppet_ssl_cert: /etc/puppetlabs/ssl/certs/puppet.example.com.pem +-#:puppet_ssl_key: /etc/puppetlabs/ssl/private_keys/puppet.example.com.pem ++#:puppet_ssl_ca: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/ca.pem ++#:puppet_ssl_cert: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/puppet.example.com.pem ++#:puppet_ssl_key: %%LOCALBASE%%/etc/puppetlabs/ssl/private_keys/puppet.example.com.pem 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 index 52f93d135b18..a8f00ac16ab6 100644 --- 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 @@ -1,13 +1,14 @@ ---- config/settings.d/realm_freeipa.yml.example.orig 2018-12-06 13:30:25.000000000 +0100 -+++ config/settings.d/realm_freeipa.yml.example 2019-02-11 22:24:18.091737000 +0100 -@@ -1,8 +1,8 @@ +--- config/settings.d/realm_freeipa.yml.example.orig 2022-09-08 13:50:11 UTC ++++ config/settings.d/realm_freeipa.yml.example +@@ -1,9 +1,9 @@ --- # Authentication for Kerberos-based Realms -:keytab_path: /etc/foreman-proxy/freeipa.keytab -+:realm_keytab: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab ++:keytab_path: %%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 5aae4bfc8a6a..e86fbfa5a9de 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 2018-12-06 13:30:25.000000000 +0100 -+++ config/settings.d/tftp.yml.example 2019-02-11 22:24:46.060855000 +0100 +--- config/settings.d/tftp.yml.example.orig 2022-09-08 13:50:11 UTC ++++ config/settings.d/tftp.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-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb deleted file mode 100644 index 81c97ff8734e..000000000000 --- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/proxy/http_download.rb.orig 2018-12-06 13:30:25.000000000 +0100 -+++ lib/proxy/http_download.rb 2019-02-11 22:33:58.455890000 +0100 -@@ -9,7 +9,7 @@ - - def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil) - @dst = dst -- wget = which("wget") -+ wget = "%%LOCALBASE%%/bin/wget" - read_timeout ||= DEFAULT_READ_TIMEOUT - dns_timeout ||= DEFAULT_CONNECT_TIMEOUT - connect_timeout ||= DEFAULT_DNS_TIMEOUT |