diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index 0f0838fbbaa90..b53041dc43677 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,7 +1,7 @@ # Created by: Martin Matuska PORTNAME= foreman-proxy -PORTVERSION= 2.2.3 +PORTVERSION= 2.3.5 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ @@ -18,13 +18,14 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ rubygem-rack>=2.0:www/rubygem-rack \ rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \ rubygem-rsec>=0.4.3:devel/rubygem-rsec \ + rubygem-sd_notify>=0.1.1:devel/rubygem-sd_notify \ rubygem-sinatra>=2.0:www/rubygem-sinatra \ wget:ftp/wget USES= shebangfix tar:bzip2 OPTIONS_DEFINE= BMC PUPPET6 -BMC_DESC= Depend on rubyipmi for BMC support +BMC_DESC= Depend on rubyipmi and redfish_client for BMC support PUPPET6_DESC= Depend on Puppet 6 NO_ARCH= yes @@ -50,7 +51,8 @@ PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" SHEBANG_FILES= extra/foreman-debug-proxy -BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi +BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \ + rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client PUPPET6_RUN_DEPENDS= puppet:sysutils/puppet6 \ rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas @@ -89,11 +91,10 @@ do-install: ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample .for cfg in bmc dhcp_isc dhcp_libvirt dhcp_native_ms dhcp dns_dnscmd \ dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts httpboot \ - logs puppet_proxy_customrun puppet_proxy_mcollective \ - puppet_proxy_puppet_api puppet_proxy_salt puppet_proxy_ssh puppet \ + logs puppet_proxy_puppet_api puppet \ puppetca_hostname_whitelisting puppetca_http_api \ puppetca_puppet_cert puppetca_token_whitelisting \ - puppetca realm_freeipa realm templates tftp + puppetca realm_freeipa realm registration templates tftp ${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample .endfor diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo index 6a469e5b3e7af..f3c7b93ef8ff3 100644 --- a/net/foreman-proxy/distinfo +++ b/net/foreman-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630727352 -SHA256 (foreman-proxy-2.2.3.tar.bz2) = fcbfe1c0befb3bbb4b9af3790c0f1e991746da1f98c1343c0ea86b91d71b6ec0 -SIZE (foreman-proxy-2.2.3.tar.bz2) = 208927 +TIMESTAMP = 1637598556 +SHA256 (foreman-proxy-2.3.5.tar.bz2) = 879f0f656bd139c19dab6d68665672a45f747e60a7407332094c81edaf15883a +SIZE (foreman-proxy-2.3.5.tar.bz2) = 198327 diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist index 0816b4d697484..5673caab475be 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -12,11 +12,7 @@ @sample %%ETCDIR%%/settings.d/httpboot.yml.sample @sample %%ETCDIR%%/settings.d/logs.yml.sample @sample %%ETCDIR%%/settings.d/puppet.yml.sample -@sample %%ETCDIR%%/settings.d/puppet_proxy_customrun.yml.sample -@sample %%ETCDIR%%/settings.d/puppet_proxy_mcollective.yml.sample @sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample -@sample %%ETCDIR%%/settings.d/puppet_proxy_salt.yml.sample -@sample %%ETCDIR%%/settings.d/puppet_proxy_ssh.yml.sample @sample %%ETCDIR%%/settings.d/puppetca.yml.sample @sample %%ETCDIR%%/settings.d/puppetca_hostname_whitelisting.yml.sample @sample %%ETCDIR%%/settings.d/puppetca_http_api.yml.sample @@ -24,6 +20,7 @@ @sample %%ETCDIR%%/settings.d/puppetca_token_whitelisting.yml.sample @sample %%ETCDIR%%/settings.d/realm.yml.sample @sample %%ETCDIR%%/settings.d/realm_freeipa.yml.sample +@sample %%ETCDIR%%/settings.d/registration.yml.sample @sample %%ETCDIR%%/settings.d/templates.yml.sample @sample %%ETCDIR%%/settings.d/tftp.yml.sample @sample %%ETCDIR%%/settings.yml.sample @@ -86,7 +83,6 @@ sbin/smart-proxy %%DATADIR%%/lib/proxy/provider_factory.rb %%DATADIR%%/lib/proxy/request.rb %%DATADIR%%/lib/proxy/request_id_middleware.rb -%%DATADIR%%/lib/proxy/sd_notify.rb %%DATADIR%%/lib/proxy/settings.rb %%DATADIR%%/lib/proxy/settings/global.rb %%DATADIR%%/lib/proxy/settings/plugin.rb @@ -105,6 +101,9 @@ sbin/smart-proxy %%DATADIR%%/modules/bmc/bmc_plugin.rb %%DATADIR%%/modules/bmc/http_config.ru %%DATADIR%%/modules/bmc/ipmi.rb +%%DATADIR%%/modules/bmc/redfish.rb +%%DATADIR%%/modules/bmc/redfish/dell.rb +%%DATADIR%%/modules/bmc/redfish/hpe.rb %%DATADIR%%/modules/bmc/shell.rb %%DATADIR%%/modules/bmc/ssh.rb %%DATADIR%%/modules/dhcp/configuration_loader.rb @@ -191,29 +190,12 @@ sbin/smart-proxy %%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb %%DATADIR%%/modules/puppet_proxy_common/errors.rb %%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb -%%DATADIR%%/modules/puppet_proxy_common/runner.rb -%%DATADIR%%/modules/puppet_proxy_customrun/customrun_main.rb -%%DATADIR%%/modules/puppet_proxy_customrun/plugin_configuration.rb -%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun.rb -%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun_plugin.rb -%%DATADIR%%/modules/puppet_proxy_mcollective/mcollective_main.rb -%%DATADIR%%/modules/puppet_proxy_mcollective/plugin_configuration.rb -%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective.rb -%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective_plugin.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environment_classes_api_classes_retriever.rb %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb -%%DATADIR%%/modules/puppet_proxy_salt/plugin_configuration.rb -%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt.rb -%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt_plugin.rb -%%DATADIR%%/modules/puppet_proxy_salt/salt_main.rb -%%DATADIR%%/modules/puppet_proxy_ssh/plugin_configuration.rb -%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh.rb -%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_main.rb -%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_plugin.rb %%DATADIR%%/modules/puppetca/dependency_injection.rb %%DATADIR%%/modules/puppetca/http_config.ru %%DATADIR%%/modules/puppetca/plugin_configuration.rb @@ -250,6 +232,11 @@ sbin/smart-proxy %%DATADIR%%/modules/realm_freeipa/provider.rb %%DATADIR%%/modules/realm_freeipa/realm_freeipa.rb %%DATADIR%%/modules/realm_freeipa/realm_freeipa_plugin.rb +%%DATADIR%%/modules/registration/http_config.ru +%%DATADIR%%/modules/registration/proxy_request.rb +%%DATADIR%%/modules/registration/registration.rb +%%DATADIR%%/modules/registration/registration_api.rb +%%DATADIR%%/modules/registration/registration_plugin.rb %%DATADIR%%/modules/root/http_config.ru %%DATADIR%%/modules/root/root.rb %%DATADIR%%/modules/root/root_api.rb