Attachment #229824 for bug #253008




# Created by: Martin Matuska <mm@FreeBSD.org>

PORTNAME=	foreman-proxy
PORTVERSION=	2.3.5
CATEGORIES=	net
MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/



SHEBANG_FILES=	extra/foreman-debug-proxy

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


		${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_puppet_api puppet \
	puppet_proxy_mcollective puppet_proxy_puppet_api \
	puppet_proxy_salt puppet_proxy_ssh puppet \
	puppetca realm templates tftp
	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample

Lines 1-3 Link Here

(-)b/net/foreman-proxy/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1630727352	1	TIMESTAMP = 1630770915
2	SHA256 (foreman-proxy-2.2.3.tar.bz2) = fcbfe1c0befb3bbb4b9af3790c0f1e991746da1f98c1343c0ea86b91d71b6ec0	2	SHA256 (foreman-proxy-2.3.5.tar.bz2) = 879f0f656bd139c19dab6d68665672a45f747e60a7407332094c81edaf15883a
3	SIZE (foreman-proxy-2.2.3.tar.bz2) = 208927	3	SIZE (foreman-proxy-2.3.5.tar.bz2) = 198327




--- lib/launcher.rb.orig	2021-06-09 10:46:47 UTC
+++ lib/launcher.rb
@@ -2,7 +2,6 @@ require 'proxy/log'
 require 'proxy/settings'
 require 'proxy/signal_handler'
 require 'proxy/log_buffer/trace_decorator'
-require 'sd_notify'
 
 CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES256-GCM-SHA384',
            'AES128-GCM-SHA256', 'AES256-GCM-SHA384', 'AES128-SHA256',
@@ -172,7 +171,6 @@
 
       http_app = http_app(settings.http_port)
       https_app = https_app(settings.https_port)
-      install_webrick_callback!(http_app, https_app)
 
       t1 = Thread.new { webrick_server(https_app, settings.bind_host, settings.https_port).start } unless https_app.nil?
       t2 = Thread.new { webrick_server(http_app, settings.bind_host, settings.http_port).start } unless http_app.nil?
@@ -190,29 +188,6 @@
       logger.error "Error during startup, terminating", e
       puts "Errors detected on startup, see log for details. Exiting: #{e}"
       exit(1)
-    end
-
-    def install_webrick_callback!(*apps)
-      apps.compact!
-
-      # track how many webrick apps are still starting up
-      @pending_webrick = apps.size
-      @pending_webrick_lock = Mutex.new
-
-      apps.each do |app|
-        # add a callback to each server, decrementing the pending counter
-        app[:StartCallback] = lambda do
-          @pending_webrick_lock.synchronize do
-            @pending_webrick -= 1
-            launched(apps) if @pending_webrick.zero?
-          end
-        end
-      end
-    end
-
-    def launched(apps)
-      logger.info("Smart proxy has launched on #{apps.size} socket(s), waiting for requests")
-      SdNotify.ready
     end
   end
 end

Lines 11-21 Link Here

(-)b/net/foreman-proxy/pkg-plist (-22 / +8 lines)
11	@sample %%ETCDIR%%/settings.d/facts.yml.sample	11	@sample %%ETCDIR%%/settings.d/facts.yml.sample
12	@sample %%ETCDIR%%/settings.d/logs.yml.sample	12	@sample %%ETCDIR%%/settings.d/logs.yml.sample
13	@sample %%ETCDIR%%/settings.d/puppet.yml.sample	13	@sample %%ETCDIR%%/settings.d/puppet.yml.sample
14	@sample %%ETCDIR%%/settings.d/puppet_proxy_customrun.yml.sample
15	@sample %%ETCDIR%%/settings.d/puppet_proxy_mcollective.yml.sample
16	@sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample	14	@sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample
17	@sample %%ETCDIR%%/settings.d/puppet_proxy_salt.yml.sample
18	@sample %%ETCDIR%%/settings.d/puppet_proxy_ssh.yml.sample
19	@sample %%ETCDIR%%/settings.d/puppetca.yml.sample	15	@sample %%ETCDIR%%/settings.d/puppetca.yml.sample
20	@sample %%ETCDIR%%/settings.d/realm.yml.sample	16	@sample %%ETCDIR%%/settings.d/realm.yml.sample
21	@sample %%ETCDIR%%/settings.d/templates.yml.sample	17	@sample %%ETCDIR%%/settings.d/templates.yml.sample
Lines 80-86 sbin/smart-proxy Link Here
80	%%DATADIR%%/lib/proxy/provider_factory.rb	76	%%DATADIR%%/lib/proxy/provider_factory.rb
81	%%DATADIR%%/lib/proxy/request.rb	77	%%DATADIR%%/lib/proxy/request.rb
82	%%DATADIR%%/lib/proxy/request_id_middleware.rb	78	%%DATADIR%%/lib/proxy/request_id_middleware.rb
83	%%DATADIR%%/lib/proxy/sd_notify.rb
84	%%DATADIR%%/lib/proxy/settings.rb	79	%%DATADIR%%/lib/proxy/settings.rb
85	%%DATADIR%%/lib/proxy/settings/global.rb	80	%%DATADIR%%/lib/proxy/settings/global.rb
86	%%DATADIR%%/lib/proxy/settings/plugin.rb	81	%%DATADIR%%/lib/proxy/settings/plugin.rb
Lines 99-104 sbin/smart-proxy Link Here
99	%%DATADIR%%/modules/bmc/bmc_plugin.rb	94	%%DATADIR%%/modules/bmc/bmc_plugin.rb
100	%%DATADIR%%/modules/bmc/http_config.ru	95	%%DATADIR%%/modules/bmc/http_config.ru
101	%%DATADIR%%/modules/bmc/ipmi.rb	96	%%DATADIR%%/modules/bmc/ipmi.rb
		97	%%DATADIR%%/modules/bmc/redfish.rb
		98	%%DATADIR%%/modules/bmc/redfish/dell.rb
		99	%%DATADIR%%/modules/bmc/redfish/hpe.rb
102	%%DATADIR%%/modules/bmc/shell.rb	100	%%DATADIR%%/modules/bmc/shell.rb
103	%%DATADIR%%/modules/bmc/ssh.rb	101	%%DATADIR%%/modules/bmc/ssh.rb
104	%%DATADIR%%/modules/dhcp/configuration_loader.rb	102	%%DATADIR%%/modules/dhcp/configuration_loader.rb
Lines 185-213 sbin/smart-proxy Link Here
185	%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb	183	%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
186	%%DATADIR%%/modules/puppet_proxy_common/errors.rb	184	%%DATADIR%%/modules/puppet_proxy_common/errors.rb
187	%%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb	185	%%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb
188	%%DATADIR%%/modules/puppet_proxy_common/runner.rb
189	%%DATADIR%%/modules/puppet_proxy_customrun/customrun_main.rb
190	%%DATADIR%%/modules/puppet_proxy_customrun/plugin_configuration.rb
191	%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun.rb
192	%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun_plugin.rb
193	%%DATADIR%%/modules/puppet_proxy_mcollective/mcollective_main.rb
194	%%DATADIR%%/modules/puppet_proxy_mcollective/plugin_configuration.rb
195	%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective.rb
196	%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective_plugin.rb
197	%%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb	186	%%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb
198	%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb	187	%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb
199	%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb	188	%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb
200	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb	189	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb
201	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environment_classes_api_classes_retriever.rb	190	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environment_classes_api_classes_retriever.rb
202	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb	191	%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb
203	%%DATADIR%%/modules/puppet_proxy_salt/plugin_configuration.rb
204	%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt.rb
205	%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt_plugin.rb
206	%%DATADIR%%/modules/puppet_proxy_salt/salt_main.rb
207	%%DATADIR%%/modules/puppet_proxy_ssh/plugin_configuration.rb
208	%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh.rb
209	%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_main.rb
210	%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_plugin.rb
211	%%DATADIR%%/modules/puppetca/dependency_injection.rb	192	%%DATADIR%%/modules/puppetca/dependency_injection.rb
212	%%DATADIR%%/modules/puppetca/http_config.ru	193	%%DATADIR%%/modules/puppetca/http_config.ru
213	%%DATADIR%%/modules/puppetca/plugin_configuration.rb	194	%%DATADIR%%/modules/puppetca/plugin_configuration.rb
Lines 244-249 sbin/smart-proxy Link Here
244	%%DATADIR%%/modules/realm_freeipa/provider.rb	225	%%DATADIR%%/modules/realm_freeipa/provider.rb
245	%%DATADIR%%/modules/realm_freeipa/realm_freeipa.rb	226	%%DATADIR%%/modules/realm_freeipa/realm_freeipa.rb
246	%%DATADIR%%/modules/realm_freeipa/realm_freeipa_plugin.rb	227	%%DATADIR%%/modules/realm_freeipa/realm_freeipa_plugin.rb
		228	%%DATADIR%%/modules/registration/http_config.ru
		229	%%DATADIR%%/modules/registration/proxy_request.rb
		230	%%DATADIR%%/modules/registration/registration.rb
		231	%%DATADIR%%/modules/registration/registration_api.rb
		232	%%DATADIR%%/modules/registration/registration_plugin.rb
247	%%DATADIR%%/modules/root/http_config.ru	233	%%DATADIR%%/modules/root/http_config.ru
248	%%DATADIR%%/modules/root/root.rb	234	%%DATADIR%%/modules/root/root.rb
249	%%DATADIR%%/modules/root/root_api.rb	235	%%DATADIR%%/modules/root/root_api.rb

Return to bug 253008

Lines 1-7 Link Here

(-)b/net/foreman-proxy/Makefile (-5 / +4 lines)
1	# Created by: Martin Matuska <mm@FreeBSD.org>	1	# Created by: Martin Matuska <mm@FreeBSD.org>
2		2
3	PORTNAME= foreman-proxy	3	PORTNAME= foreman-proxy
4	PORTVERSION= 2.2.3	4	PORTVERSION= 2.3.5
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/	6	MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/
7		7
Lines 50-56 PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" Link Here
50		50
51	SHEBANG_FILES= extra/foreman-debug-proxy	51	SHEBANG_FILES= extra/foreman-debug-proxy
52		52
53	BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi	53	BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \
		54	rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client
54	PUPPET6_RUN_DEPENDS= puppet:sysutils/puppet6 \	55	PUPPET6_RUN_DEPENDS= puppet:sysutils/puppet6 \
55	rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas	56	rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas
56		57
Lines 89-97 do-install: Link Here
89	${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample	90	${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
90	.for cfg in bmc dhcp_isc dhcp_libvirt dhcp_native_ms dhcp dns_dnscmd \	91	.for cfg in bmc dhcp_isc dhcp_libvirt dhcp_native_ms dhcp dns_dnscmd \
91	dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts logs \	92	dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts logs \
92	puppet_proxy_customrun \	93	puppet_proxy_puppet_api puppet \
93	puppet_proxy_mcollective puppet_proxy_puppet_api \
94	puppet_proxy_salt puppet_proxy_ssh puppet \
95	puppetca realm templates tftp	94	puppetca realm templates tftp
96	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \	95	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
97	${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample	96	${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample

Added Link Here

(-)b/net/foreman-proxy/files/patch-lib_launcher.rb (+48 lines)
1	--- lib/launcher.rb.orig 2021-06-09 10:46:47 UTC
2	+++ lib/launcher.rb
3	@@ -2,7 +2,6 @@ require 'proxy/log'
4	require 'proxy/settings'
5	require 'proxy/signal_handler'
6	require 'proxy/log_buffer/trace_decorator'
7	-require 'sd_notify'
8
9	CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES256-GCM-SHA384',
10	'AES128-GCM-SHA256', 'AES256-GCM-SHA384', 'AES128-SHA256',
11	@@ -172,7 +171,6 @@
12
13	http_app = http_app(settings.http_port)
14	https_app = https_app(settings.https_port)
15	- install_webrick_callback!(http_app, https_app)
16
17	t1 = Thread.new { webrick_server(https_app, settings.bind_host, settings.https_port).start } unless https_app.nil?
18	t2 = Thread.new { webrick_server(http_app, settings.bind_host, settings.http_port).start } unless http_app.nil?
19	@@ -190,29 +188,6 @@
20	logger.error "Error during startup, terminating", e
21	puts "Errors detected on startup, see log for details. Exiting: #{e}"
22	exit(1)
23	- end
24	-
25	- def install_webrick_callback!(*apps)
26	- apps.compact!
27	-
28	- # track how many webrick apps are still starting up
29	- @pending_webrick = apps.size
30	- @pending_webrick_lock = Mutex.new
31	-
32	- apps.each do \|app\|
33	- # add a callback to each server, decrementing the pending counter
34	- app[:StartCallback] = lambda do
35	- @pending_webrick_lock.synchronize do
36	- @pending_webrick -= 1
37	- launched(apps) if @pending_webrick.zero?
38	- end
39	- end
40	- end
41	- end
42	-
43	- def launched(apps)
44	- logger.info("Smart proxy has launched on #{apps.size} socket(s), waiting for requests")
45	- SdNotify.ready
46	end
47	end
48	end