Index: head/net/foreman-proxy/Makefile =================================================================== --- head/net/foreman-proxy/Makefile (revision 404394) +++ head/net/foreman-proxy/Makefile (revision 404395) @@ -1,89 +1,90 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= foreman-proxy -PORTVERSION= 1.9.1 +PORTVERSION= 1.10.0 CATEGORIES= net MASTER_SITES= http://downloads.theforeman.org/foreman-proxy/ MAINTAINER= mmoll@FreeBSD.org COMMENT= Foreman Proxy Agent LICENSE= GPLv3 RUN_DEPENDS= rubygem-bundler_ext>=0.4:${PORTSDIR}/sysutils/rubygem-bundler_ext \ rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \ rubygem-rack16>=1.4:${PORTSDIR}/www/rubygem-rack16 \ rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget OPTIONS_DEFINE= BMC PUPPET BMC_DESC= Depend on rubyipmi for BMC support PUPPET_DESC= Depend on Puppet USES= tar:bzip2 USE_RUBY= yes USE_RC_SUBR= foreman-proxy NO_BUILD= yes NO_ARCH= yes FOREMAN_PROXY_USER?= foreman_proxy FOREMAN_PROXY_GROUP?= foreman_proxy FOREMAN_PROXY_LOGDIR?= /var/log/foreman-proxy FOREMAN_PROXY_RUNDIR?= /var/run/foreman-proxy USERS= ${FOREMAN_PROXY_USER} GROUPS= ${FOREMAN_PROXY_GROUP} SUB_LIST= RUBY="${RUBY}" \ FOREMAN_PROXY_USER="${FOREMAN_PROXY_USER}" \ FOREMAN_PROXY_GROUP="${FOREMAN_PROXY_GROUP}" \ FOREMAN_PROXY_RUNDIR="${FOREMAN_PROXY_RUNDIR}" \ FOREMAN_PROXY_LOGDIR="${FOREMAN_PROXY_LOGDIR}" PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:${PORTSDIR}/sysutils/rubygem-rubyipmi PUPPET_RUN_DEPENDS= puppet:${PORTSDIR}/sysutils/puppet \ rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-ruby-augeas post-patch: @${REINPLACE_CMD} \ -e "s|/usr/bin/env ruby|${RUBY}|g" \ -e "s|/usr/bin/ruby|${RUBY}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%DATADIR%%|${DATADIR}|g" \ ${WRKSRC}/bin/smart-proxy \ ${WRKSRC}/extra/migrate_settings.rb \ ${WRKSRC}/extra/query.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/config/settings.d/*.yml.example \ - ${WRKSRC}/lib/proxy/http_downloads.rb + ${WRKSRC}/lib/proxy/http_download.rb do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d ${MKDIR} ${STAGEDIR}${DATADIR}/extra ${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config ${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \ ${STAGEDIR}${PREFIX}/sbin/smart-proxy .for file in CHANGELOG Contributors Gemfile LICENSE README.md \ VERSION bundler.d config.ru lib modules public views ${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} .endfor ${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in .for script in migrate_settings.rb query.rb ${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \ ${STAGEDIR}${DATADIR}/extra/${script} .endfor ${CP} -r ${WRKSRC}/extra/migrations ${STAGEDIR}${DATADIR}/extra ${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample -.for cfg in bmc dhcp dns facts puppet puppetca realm templates tftp +.for cfg in bmc dhcp dns dns_dnscmd dns_nsupdate_gss dns_nsupdate dns_virsh \ + facts puppet puppetca realm templates tftp ${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample .endfor ${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \ ${STAGEDIR}${FOREMAN_PROXY_RUNDIR} .include Index: head/net/foreman-proxy/distinfo =================================================================== --- head/net/foreman-proxy/distinfo (revision 404394) +++ head/net/foreman-proxy/distinfo (revision 404395) @@ -1,2 +1,2 @@ -SHA256 (foreman-proxy-1.9.1.tar.bz2) = b398bc87f77c98f25cf4c565d7e91b466538e17aff2fbe685181e25cd65081f0 -SIZE (foreman-proxy-1.9.1.tar.bz2) = 109252 +SHA256 (foreman-proxy-1.10.0.tar.bz2) = 73fbfd058249cd59103fcad7335ff8e0323b577ba92d945d01b3d8327a2819a0 +SIZE (foreman-proxy-1.10.0.tar.bz2) = 116535 Index: head/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example =================================================================== --- head/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example (revision 404394) +++ head/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example (nonexistent) @@ -1,17 +0,0 @@ ---- config/settings.d/dns.yml.example.orig 2014-09-27 09:03:53.820489863 +0200 -+++ config/settings.d/dns.yml.example 2014-09-27 09:06:50.266460447 +0200 -@@ -6,12 +6,12 @@ - # virsh - # dnscmd - #:dns_provider: nsupdate --#:dns_key: /etc/rndc.key -+#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key - # use this setting if you are managing a dns server which is not localhost though this proxy - #:dns_server: dns.domain.com - # use this setting if you want to override default TTL setting (86400) - #:dns_ttl: 86400 - # use dns_tsig_* for GSS-TSIG updates using Kerberos. Required for Windows MS DNS with - # Secure Dynamic Updates, or BIND as used in FreeIPA. Set dns_provider to nsupdate_gss. --#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab -+#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab - #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM Property changes on: head/net/foreman-proxy/files/patch-config-settings.d-dns.yml.example ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb =================================================================== --- head/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb (revision 404394) +++ head/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb (nonexistent) @@ -1,14 +0,0 @@ ---- lib/proxy/http_downloads.rb.orig 2014-09-27 09:21:12.321398953 +0200 -+++ lib/proxy/http_downloads.rb 2014-09-27 09:21:39.710436545 +0200 -@@ -31,8 +31,8 @@ - end - - def command(src, dst) -- wget = which("wget") -+ wget = "%%LOCALBASE%%/bin/wget" - "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(dst.to_s)}\"" - end - end --end -\ No newline at end of file -+end Property changes on: head/net/foreman-proxy/files/patch-lib-proxy-http_downloads.rb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example =================================================================== --- head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example (nonexistent) +++ head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example (revision 404395) @@ -0,0 +1,10 @@ +--- config/settings.d/dns_nsupdate.yml.example.orig 2015-12-24 23:16:48 UTC ++++ config/settings.d/dns_nsupdate.yml.example +@@ -3,6 +3,6 @@ + # Configuration file for 'nsupdate' dns provider + # + +-#:dns_key: /etc/rndc.key ++#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key + # use this setting if you are managing a dns server which is not localhost though this proxy + #:dns_server: dns.domain.com Property changes on: head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example =================================================================== --- head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example (nonexistent) +++ head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example (revision 404395) @@ -0,0 +1,9 @@ +--- config/settings.d/dns_nsupdate_gss.yml.example.orig 2015-12-24 23:18:07 UTC ++++ config/settings.d/dns_nsupdate_gss.yml.example +@@ -7,5 +7,5 @@ + #:dns_server: dns.domain.com + # use dns_tsig_* for GSS-TSIG updates using Kerberos. Required for Windows MS DNS with + # Secure Dynamic Updates, or BIND as used in FreeIPA. Set dns_provider to nsupdate_gss. +-#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab ++#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab + #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM Property changes on: head/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/foreman-proxy/files/patch-lib_proxy_http__download.rb =================================================================== --- head/net/foreman-proxy/files/patch-lib_proxy_http__download.rb (nonexistent) +++ head/net/foreman-proxy/files/patch-lib_proxy_http__download.rb (revision 404395) @@ -0,0 +1,11 @@ +--- lib/proxy/http_download.rb.orig 2015-12-24 23:13:02 UTC ++++ lib/proxy/http_download.rb +@@ -6,7 +6,7 @@ module Proxy + + def initialize(src, dst) + @dst = dst +- wget = which("wget") ++ wget = "%%LOCALBASE%%/bin/wget" + super("#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(dst.to_s)}\"") + end + Property changes on: head/net/foreman-proxy/files/patch-lib_proxy_http__download.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/foreman-proxy/pkg-plist =================================================================== --- head/net/foreman-proxy/pkg-plist (revision 404394) +++ head/net/foreman-proxy/pkg-plist (revision 404395) @@ -1,140 +1,166 @@ @sample %%ETCDIR%%/settings.d/bmc.yml.sample @sample %%ETCDIR%%/settings.d/dhcp.yml.sample @sample %%ETCDIR%%/settings.d/dns.yml.sample +@sample %%ETCDIR%%/settings.d/dns_dnscmd.yml.sample +@sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample +@sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample +@sample %%ETCDIR%%/settings.d/dns_virsh.yml.sample @sample %%ETCDIR%%/settings.d/facts.yml.sample @sample %%ETCDIR%%/settings.d/puppet.yml.sample @sample %%ETCDIR%%/settings.d/puppetca.yml.sample @sample %%ETCDIR%%/settings.d/realm.yml.sample @sample %%ETCDIR%%/settings.d/templates.yml.sample @sample %%ETCDIR%%/settings.d/tftp.yml.sample @sample %%ETCDIR%%/settings.yml.sample sbin/smart-proxy %%DATADIR%%/CHANGELOG %%DATADIR%%/Contributors %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.in %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION %%DATADIR%%/bundler.d/bmc.rb %%DATADIR%%/bundler.d/development.rb %%DATADIR%%/bundler.d/krb5.rb %%DATADIR%%/bundler.d/puppet.rb %%DATADIR%%/bundler.d/test.rb %%DATADIR%%/bundler.d/windows.rb %%DATADIR%%/config %%DATADIR%%/config.ru %%DATADIR%%/extra/migrate_settings.rb %%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb +%%DATADIR%%/extra/migrations/20150611000000_migrate_dns_settings.rb %%DATADIR%%/extra/query.rb %%DATADIR%%/lib/bundler_helper.rb %%DATADIR%%/lib/checks.rb %%DATADIR%%/lib/daemon.rb +%%DATADIR%%/lib/launcher.rb %%DATADIR%%/lib/poodles-fix.rb %%DATADIR%%/lib/proxy.rb +%%DATADIR%%/lib/proxy/dependency_injection.rb %%DATADIR%%/lib/proxy/error.rb %%DATADIR%%/lib/proxy/file_lock.rb %%DATADIR%%/lib/proxy/helpers.rb -%%DATADIR%%/lib/proxy/http_downloads.rb +%%DATADIR%%/lib/proxy/http_download.rb %%DATADIR%%/lib/proxy/kerberos.rb %%DATADIR%%/lib/proxy/log.rb +%%DATADIR%%/lib/proxy/memory_store.rb +%%DATADIR%%/lib/proxy/pluggable.rb %%DATADIR%%/lib/proxy/plugin.rb +%%DATADIR%%/lib/proxy/plugin_validators.rb +%%DATADIR%%/lib/proxy/provider.rb +%%DATADIR%%/lib/proxy/provider_factory.rb %%DATADIR%%/lib/proxy/request.rb %%DATADIR%%/lib/proxy/settings.rb %%DATADIR%%/lib/proxy/settings/global.rb %%DATADIR%%/lib/proxy/settings/plugin.rb %%DATADIR%%/lib/proxy/util.rb %%DATADIR%%/lib/proxy/validations.rb %%DATADIR%%/lib/proxy/virsh.rb %%DATADIR%%/lib/rack-patch.rb %%DATADIR%%/lib/sinatra-patch.rb %%DATADIR%%/lib/sinatra/authorization.rb %%DATADIR%%/lib/smart_proxy.rb %%DATADIR%%/lib/smart_proxy_for_testing.rb %%DATADIR%%/modules/bmc/base.rb %%DATADIR%%/modules/bmc/bmc.rb %%DATADIR%%/modules/bmc/bmc_api.rb %%DATADIR%%/modules/bmc/bmc_plugin.rb %%DATADIR%%/modules/bmc/http_config.ru %%DATADIR%%/modules/bmc/ipmi.rb %%DATADIR%%/modules/bmc/shell.rb %%DATADIR%%/modules/dhcp/dhcp.rb %%DATADIR%%/modules/dhcp/dhcp_api.rb %%DATADIR%%/modules/dhcp/dhcp_plugin.rb %%DATADIR%%/modules/dhcp/http_config.ru %%DATADIR%%/modules/dhcp/monkey_patch_subnet.rb %%DATADIR%%/modules/dhcp/monkey_patches.rb %%DATADIR%%/modules/dhcp/providers/server/isc.rb -%%DATADIR%%/modules/dhcp/providers/server/ms.rb %%DATADIR%%/modules/dhcp/providers/server/native_ms.rb %%DATADIR%%/modules/dhcp/providers/server/virsh.rb %%DATADIR%%/modules/dhcp/record.rb +%%DATADIR%%/modules/dhcp/record/deleted_reservation.rb %%DATADIR%%/modules/dhcp/record/lease.rb %%DATADIR%%/modules/dhcp/record/reservation.rb %%DATADIR%%/modules/dhcp/server.rb %%DATADIR%%/modules/dhcp/subnet.rb +%%DATADIR%%/modules/dhcp/subnet_service.rb %%DATADIR%%/modules/dns/dns.rb %%DATADIR%%/modules/dns/dns_api.rb %%DATADIR%%/modules/dns/dns_plugin.rb %%DATADIR%%/modules/dns/http_config.ru -%%DATADIR%%/modules/dns/providers/dnscmd.rb -%%DATADIR%%/modules/dns/providers/nsupdate.rb -%%DATADIR%%/modules/dns/providers/nsupdate_gss.rb -%%DATADIR%%/modules/dns/providers/virsh.rb +%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd.rb +%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_main.rb +%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_plugin.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_main.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_plugin.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_main.rb +%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_plugin.rb +%%DATADIR%%/modules/dns_virsh/dns_virsh.rb +%%DATADIR%%/modules/dns_virsh/dns_virsh_main.rb +%%DATADIR%%/modules/dns_virsh/dns_virsh_plugin.rb %%DATADIR%%/modules/facts/facts.rb %%DATADIR%%/modules/facts/facts_api.rb %%DATADIR%%/modules/facts/facts_plugin.rb %%DATADIR%%/modules/facts/http_config.ru %%DATADIR%%/modules/puppet_proxy/api_request.rb %%DATADIR%%/modules/puppet_proxy/class_scanner.rb %%DATADIR%%/modules/puppet_proxy/class_scanner_base.rb %%DATADIR%%/modules/puppet_proxy/class_scanner_eparser.rb -%%DATADIR%%/modules/puppet_proxy/class_scanner_factory.rb -%%DATADIR%%/modules/puppet_proxy/config_reader.rb %%DATADIR%%/modules/puppet_proxy/customrun.rb +%%DATADIR%%/modules/puppet_proxy/dependency_injection/container.rb +%%DATADIR%%/modules/puppet_proxy/dependency_injection/dependencies.rb %%DATADIR%%/modules/puppet_proxy/environment.rb %%DATADIR%%/modules/puppet_proxy/http_config.ru %%DATADIR%%/modules/puppet_proxy/initializer.rb %%DATADIR%%/modules/puppet_proxy/mcollective.rb -%%DATADIR%%/modules/puppet_proxy/memory_store.rb %%DATADIR%%/modules/puppet_proxy/puppet.rb %%DATADIR%%/modules/puppet_proxy/puppet_api.rb +%%DATADIR%%/modules/puppet_proxy/puppet_api_v2_environments_retriever.rb +%%DATADIR%%/modules/puppet_proxy/puppet_api_v3_environments_retriever.rb %%DATADIR%%/modules/puppet_proxy/puppet_cache.rb %%DATADIR%%/modules/puppet_proxy/puppet_class.rb +%%DATADIR%%/modules/puppet_proxy/puppet_config.rb +%%DATADIR%%/modules/puppet_proxy/puppet_config_environments_retriever.rb %%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb %%DATADIR%%/modules/puppet_proxy/puppet_ssh.rb %%DATADIR%%/modules/puppet_proxy/puppetrun.rb %%DATADIR%%/modules/puppet_proxy/runner.rb +%%DATADIR%%/modules/puppet_proxy/runtime_configuration.rb %%DATADIR%%/modules/puppet_proxy/salt.rb +%%DATADIR%%/modules/puppet_proxy/ssl_configuration_validator.rb %%DATADIR%%/modules/puppetca/http_config.ru %%DATADIR%%/modules/puppetca/puppetca.rb %%DATADIR%%/modules/puppetca/puppetca_api.rb %%DATADIR%%/modules/puppetca/puppetca_main.rb %%DATADIR%%/modules/puppetca/puppetca_plugin.rb %%DATADIR%%/modules/realm/client.rb %%DATADIR%%/modules/realm/freeipa.rb %%DATADIR%%/modules/realm/http_config.ru %%DATADIR%%/modules/realm/realm.rb %%DATADIR%%/modules/realm/realm_api.rb %%DATADIR%%/modules/realm/realm_plugin.rb %%DATADIR%%/modules/root/http_config.ru %%DATADIR%%/modules/root/root.rb %%DATADIR%%/modules/root/root_api.rb %%DATADIR%%/modules/root/root_plugin.rb -%%DATADIR%%/modules/templates/handler.rb %%DATADIR%%/modules/templates/http_config.ru +%%DATADIR%%/modules/templates/template_proxy_request.rb %%DATADIR%%/modules/templates/templates.rb %%DATADIR%%/modules/templates/templates_api.rb %%DATADIR%%/modules/templates/templates_plugin.rb %%DATADIR%%/modules/tftp/http_config.ru %%DATADIR%%/modules/tftp/server.rb %%DATADIR%%/modules/tftp/tftp.rb %%DATADIR%%/modules/tftp/tftp_api.rb %%DATADIR%%/modules/tftp/tftp_plugin.rb %%DATADIR%%/public/css/styles.css %%DATADIR%%/views/dhcp/index.erb %%DATADIR%%/views/dhcp/show.erb %%DATADIR%%/views/features/index.erb %%DATADIR%%/views/layout.erb @dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_LOGDIR%% @dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_RUNDIR%%