Skip to content
Snippets Groups Projects
Commit 61f6cf14 authored by Jason Unovitch's avatar Jason Unovitch Committed by Matthias Fechner
Browse files

net/foreman-proxy: update 1.21.2 -> 1.23.2 

Changes:	https://github.com/theforeman/smart-proxy/compare/1.21.2...1.23.2
PR:		253008
Submitted by:	junovitch
parent 59a8beae
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
net/foreman-proxy/Makefile
+ 9
− 6
View file @ 61f6cf14
# Created by: Martin Matuska <mm@FreeBSD.org>
PORTNAME= foreman-proxy
PORTVERSION= 1.21.2
PORTVERSION= 1.23.2
CATEGORIES= net
MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/
......@@ -12,7 +12,9 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \
rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
rubygem-json>=1.8.1:devel/rubygem-json \
rubygem-logging>=0:devel/rubygem-logging \
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 \
......@@ -86,11 +88,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
${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 logs \
puppet_proxy_customrun puppet_proxy_legacy \
puppet_proxy_mcollective puppet_proxy_puppet_api \
puppet_proxy_puppetrun puppet_proxy_salt puppet_proxy_ssh puppet \
puppetca realm templates tftp
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 \
puppetca_hostname_whitelisting puppetca_http_api \
puppetca_puppet_cert puppetca_token_whitelisting \
puppetca realm_freeipa realm templates tftp
${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
.endfor
......
net/foreman-proxy/distinfo
+ 3
− 3
View file @ 61f6cf14
TIMESTAMP = 1555274078
SHA256 (foreman-proxy-1.21.2.tar.bz2) = bc5590f13de8e37cfb52c9a898642ae595b91d498b0384da28602e5505245a6a
SIZE (foreman-proxy-1.21.2.tar.bz2) = 210802
TIMESTAMP = 1585316255
SHA256 (foreman-proxy-1.23.2.tar.bz2) = 6b538b9a434c59780f27f4348d6fa44cd8a1fcd20465ee767a7e8ddff4af4f26
SIZE (foreman-proxy-1.23.2.tar.bz2) = 208682
net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example deleted 100644 → 0
+ 0
− 24
View file @ 59a8beae
--- 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
net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example 0 → 100644
+ 9
− 0
View file @ 61f6cf14
--- config/settings.d/puppetca_puppet_cert.yml.example.orig 2019-12-22 22:37:03 UTC
+++ config/settings.d/puppetca_puppet_cert.yml.example
@@ -1,4 +1,4 @@
---
-#:ssldir: /var/lib/puppet/ssl
+#:ssldir: /var/puppet/ssl
#:puppetca_use_sudo: true
-#:sudo_command: /usr/bin/sudo
+#:sudo_command: %%LOCALBASE%%/bin/sudo
net/foreman-proxy/pkg-plist
+ 22
− 27
View file @ 61f6cf14
......@@ -9,17 +9,21 @@
@sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample
@sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample
@sample %%ETCDIR%%/settings.d/facts.yml.sample
@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_legacy.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_puppetrun.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
@sample %%ETCDIR%%/settings.d/puppetca_puppet_cert.yml.sample
@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/templates.yml.sample
@sample %%ETCDIR%%/settings.d/tftp.yml.sample
@sample %%ETCDIR%%/settings.yml.sample
......@@ -37,7 +41,6 @@ sbin/smart-proxy
%%DATADIR%%/bundler.d/journald.rb
%%DATADIR%%/bundler.d/krb5.rb
%%DATADIR%%/bundler.d/libvirt.rb
%%DATADIR%%/bundler.d/puppet.rb
%%DATADIR%%/bundler.d/puppetca_token_whitelisting.rb
%%DATADIR%%/bundler.d/realm_freeipa.rb
%%DATADIR%%/bundler.d/test.rb
......@@ -54,11 +57,11 @@ sbin/smart-proxy
%%DATADIR%%/extra/migrations/20161209000000_migrate_realm_settings.rb
%%DATADIR%%/extra/migrations/20170523000000_migrate_autosign_setting.rb
%%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
%%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
%%DATADIR%%/extra/query.rb
%%DATADIR%%/extra/register-service.rb
%%DATADIR%%/lib/bundler_helper.rb
%%DATADIR%%/lib/checks.rb
%%DATADIR%%/lib/daemon.rb
%%DATADIR%%/lib/hash-patch.rb
%%DATADIR%%/lib/launcher.rb
%%DATADIR%%/lib/proxy/default_di_wirings.rb
%%DATADIR%%/lib/proxy/default_plugin_validators.rb
......@@ -67,8 +70,6 @@ sbin/smart-proxy
%%DATADIR%%/lib/proxy/file_lock.rb
%%DATADIR%%/lib/proxy/helpers.rb
%%DATADIR%%/lib/proxy/http_download.rb
%%DATADIR%%/lib/proxy/http_download.rb.bak
%%DATADIR%%/lib/proxy/http_download.rb.orig
%%DATADIR%%/lib/proxy/kerberos.rb
%%DATADIR%%/lib/proxy/log.rb
%%DATADIR%%/lib/proxy/log_buffer/buffer.rb
......@@ -92,7 +93,6 @@ sbin/smart-proxy
%%DATADIR%%/lib/proxy/signal_handler.rb
%%DATADIR%%/lib/proxy/util.rb
%%DATADIR%%/lib/proxy/validations.rb
%%DATADIR%%/lib/rack-patch.rb
%%DATADIR%%/lib/sinatra/authorization.rb
%%DATADIR%%/lib/sinatra/default_not_found_page.rb
%%DATADIR%%/lib/smart_proxy.rb
......@@ -199,18 +199,6 @@ sbin/smart-proxy
%%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_legacy/class_scanner.rb
%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_base.rb
%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_eparser.rb
%%DATADIR%%/modules/puppet_proxy_legacy/environments_api_request.rb
%%DATADIR%%/modules/puppet_proxy_legacy/initializer.rb
%%DATADIR%%/modules/puppet_proxy_legacy/plugin_configuration.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_api_v2_environments_retriever.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_cache.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config_environments_retriever.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy.rb
%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy_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
......@@ -219,13 +207,8 @@ sbin/smart-proxy
%%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_classes_retriever.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_puppetrun/plugin_configuration.rb
%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun.rb
%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun_plugin.rb
%%DATADIR%%/modules/puppet_proxy_puppetrun/puppetrun_main.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
......@@ -240,11 +223,19 @@ sbin/smart-proxy
%%DATADIR%%/modules/puppetca/puppetca.rb
%%DATADIR%%/modules/puppetca/puppetca_api.rb
%%DATADIR%%/modules/puppetca/puppetca_plugin.rb
%%DATADIR%%/modules/puppetca/puppetca_puppet_cert.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_autosigner.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_plugin.rb
%%DATADIR%%/modules/puppetca_http_api/ca_v1_api_request.rb
%%DATADIR%%/modules/puppetca_http_api/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api.rb
%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api_plugin.rb
%%DATADIR%%/modules/puppetca_http_api/puppetca_impl.rb
%%DATADIR%%/modules/puppetca_puppet_cert/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_impl.rb
%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert.rb
%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert_plugin.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting_autosigner.rb
......@@ -267,11 +258,15 @@ sbin/smart-proxy
%%DATADIR%%/modules/root/root_api.rb
%%DATADIR%%/modules/root/root_module_loader.rb
%%DATADIR%%/modules/root/root_plugin.rb
%%DATADIR%%/modules/root/root_v2_api.rb
%%DATADIR%%/modules/templates/http_config.ru
%%DATADIR%%/modules/templates/proxy_request.rb
%%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/templates/templates_unattended_api.rb
%%DATADIR%%/modules/templates/templates_userdata_api.rb
%%DATADIR%%/modules/templates/userdata_proxy_request.rb
%%DATADIR%%/modules/tftp/http_config.ru
%%DATADIR%%/modules/tftp/server.rb
%%DATADIR%%/modules/tftp/tftp.rb
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment