12 files changed, 153 insertions, 149 deletions

diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index ee762e8ce2a2..291839ad89ec 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTVERSION=	1.12.2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.theforeman.org/foreman-proxy/
 
@@ -75,7 +74,7 @@ do-install:
 	${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
+	VERSION bundler.d config.ru lib modules
 	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
 	${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
@@ -86,8 +85,11 @@ do-install:
 	${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 dns_dnscmd dns_nsupdate_gss dns_nsupdate dns_virsh \
-	facts puppet puppetca realm templates tftp
+.for cfg in bmc dhcp dhcp_isc dhcp_libvirt dhcp_ms_native dns dns_dnscmd \
+	dns_libvirt dns_nsupdate dns_nsupdate dns_nsupdate_gss \
+	facts logs puppet puppet_proxy_customrun puppet_proxy_legacy \
+	puppet_proxy_mcollective puppet_proxy_puppet_api puppet_proxy_puppetrun \
+	puppet_proxy_salt puppet_proxy_ssh puppetca realm 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 4cf9f79be361..b86a7f313837 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (foreman-proxy-1.10.0.tar.bz2) = 73fbfd058249cd59103fcad7335ff8e0323b577ba92d945d01b3d8327a2819a0
-SIZE (foreman-proxy-1.10.0.tar.bz2) = 116535
+TIMESTAMP = 1473110479
+SHA256 (foreman-proxy-1.12.2.tar.bz2) = 7d1c807da404a413c47c3931bbad1189aa1c643017ffad7d6a23f69a5d9a7735
+SIZE (foreman-proxy-1.12.2.tar.bz2) = 141089
diff --git a/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example b/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example
deleted file mode 100644
index d6a5c3c952eb..000000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/settings.d/dhcp.yml.example.orig	2014-09-27 09:03:57.507470266 +0200
-+++ config/settings.d/dhcp.yml.example	2014-09-27 09:06:15.715460654 +0200
-@@ -8,14 +8,8 @@
- # dhcp_subnets is an ISC &  Native MS implementation setting. It restricts the subnets queried to a
- # subset, so as to reduce the query time.
- #:dhcp_subnets: [192.168.205.0/255.255.255.128, 192.168.205.128/255.255.255.128]
--# Settings for Ubuntu ISC
--#:dhcp_config: /etc/dhcp3/dhcpd.conf
--#:dhcp_leases: /var/lib/dhcp3/dhcpd.leases
--# Settings for Redhat ISC
--# Redhat 5
--#:dhcp_config: /etc/dhcpd.conf
--# Redhat 6
--#:dhcp_config: /etc/dhcp/dhcpd.conf
--#:dhcp_leases: /var/lib/dhcpd/dhcpd.leases
-+# Settings for FreeBSD ISC
-+#:dhcp_config: %%LOCALBASE%%/etc/dhcpd.conf
-+#:dhcp_leases: /var/db/dhcpd.leases
- #:dhcp_key_name: secret_key_name
- #:dhcp_key_secret: secret_key
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example
deleted file mode 100644
index c9a9e87ef22f..000000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example
+++ /dev/null
@@ -1,43 +0,0 @@
---- config/settings.d/puppet.yml.example.orig	2014-12-02 11:27:28.000000000 +0100
-+++ config/settings.d/puppet.yml.example	2014-12-04 11:27:31.399941182 +0100
-@@ -10,23 +10,23 @@
- 
- # Customrun command details
- # Set :customrun_cmd to the full path of the script you want to run, instead of /bin/false
--:customrun_cmd: /bin/false
-+:customrun_cmd: /usr/bin/false
- # Set :customrun_args to any args you want to pass to your custom script. The hostname of the
- # system to run against will be appended after the custom commands.
- :customrun_args: -ay -f -s
- 
--:puppet_conf: /etc/puppet/puppet.conf
-+:puppet_conf: %%LOCALBASE%%/etc/puppet/puppet.conf
- # whether to use sudo before the ssh command
- :puppetssh_sudo: false
- # the command which will be sent to the host
--:puppetssh_command: /usr/bin/puppet agent --onetime --no-usecacheonfailure
-+:puppetssh_command: %%LOCALBASE%%/bin/puppet agent --onetime --no-usecacheonfailure
- # wait for the command to finish (and capture exit code), or detach process and return 0
- # Note: enabling this option causes the Foreman web UI to be blocked when executing puppetrun,
- # with timeout from the Browser and/or Foreman's REST client after 60 seconds.
- :puppetssh_wait: false
- # With which user should the proxy connect
- #:puppetssh_user: root
--#:puppetssh_keyfile: /etc/foreman-proxy/id_rsa
-+#:puppetssh_keyfile: %%PREFIX%%/etc/foreman-proxy/id_rsa
- 
- # Which user to invoke sudo as to run puppet commands
- #:puppet_user: root
-@@ -34,9 +34,9 @@
- # URL of the puppet master itself for API requests
- #:puppet_url: https://puppet.example.com:8140
- # SSL certificates used to access the puppet master API
--#: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
- 
- # 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
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
index 909dcb619db0..c00278e90590 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
@@ -1,8 +1,9 @@
---- config/settings.d/puppetca.yml.example.orig	2014-09-27 09:16:47.493418158 +0200
-+++ config/settings.d/puppetca.yml.example	2014-09-27 09:16:08.243420797 +0200
-@@ -1,6 +1,6 @@
- ---
+--- config/settings.d/puppetca.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/puppetca.yml.example	2016-09-05 23:43:16.509994000 +0200
+@@ -2,7 +2,7 @@
+ # Can be true, false, or http/https to enable just one of the protocols
  :enabled: false
+ 
 -#:ssldir: /var/lib/puppet/ssl
 -#:puppetdir: /etc/puppet
 +#:ssldir: /var/puppet/ssl
diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
index 42d19374cbdb..a24cad590744 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
@@ -1,6 +1,6 @@
---- config/settings.d/realm.yml.example.orig	2014-09-27 09:04:28.342471788 +0200
-+++ config/settings.d/realm.yml.example	2014-09-27 09:17:21.098415262 +0200
-@@ -6,7 +6,7 @@
+--- config/settings.d/realm.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/realm.yml.example	2016-09-05 23:44:35.005749000 +0200
+@@ -7,7 +7,7 @@
  #:realm_provider: freeipa
  
  # Authentication for Kerberos-based Realms
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 a7475421a8a2..0763e6d6a8ef 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,8 +1,9 @@
---- config/settings.d/tftp.yml.example.orig	2014-09-27 09:03:48.161469593 +0200
-+++ config/settings.d/tftp.yml.example	2014-09-27 09:07:14.400462451 +0200
-@@ -1,5 +1,5 @@
- ---
+--- config/settings.d/tftp.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/tftp.yml.example	2016-09-05 23:44:01.480711000 +0200
+@@ -2,6 +2,6 @@
+ # Can be true, false, or http/https to enable just one of the protocols
  :enabled: false
+ 
 -#:tftproot: /var/lib/tftpboot
 +#:tftproot: /tftpboot
  # Defines the TFTP Servername to use, overrides the name in the subnet declaration
diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example
index 7b44082317de..2a23656a61f7 100644
--- a/net/foreman-proxy/files/patch-config-settings.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.yml.example
@@ -1,6 +1,6 @@
---- config/settings.yml.example.orig	2014-12-04 11:41:56.011675735 +0100
-+++ config/settings.yml.example	2014-12-04 11:42:13.978674196 +0100
-@@ -25,7 +25,7 @@
+--- config/settings.yml.example.orig	2016-08-24 09:01:39.000000000 +0200
++++ config/settings.yml.example	2016-09-05 23:33:49.472857000 +0200
+@@ -38,7 +38,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
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
deleted file mode 100644
index 323fcf701edf..000000000000
--- a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
deleted file mode 100644
index 917b5a9714c7..000000000000
--- a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
diff --git a/net/foreman-proxy/pkg-message b/net/foreman-proxy/pkg-message
new file mode 100644
index 000000000000..7a3baf83091f
--- /dev/null
+++ b/net/foreman-proxy/pkg-message
@@ -0,0 +1,10 @@
+WARNING:
+
+In version 1.11+ Foreman Smart Proxy splits its configuration in even smaller
+chunks located in:
+
+${PREFIX}/etc/foreman-proxy/settings.d
+
+You can use a bundled script to convert your old settings to new settings:
+
+${PREFIX}/share/foreman/extra/migrate_settings.rb
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index dbcd0bafaaa9..931398464ea9 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -1,12 +1,23 @@
 @sample %%ETCDIR%%/settings.d/bmc.yml.sample
 @sample %%ETCDIR%%/settings.d/dhcp.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_isc.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_libvirt.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_ms_native.yml.sample
 @sample %%ETCDIR%%/settings.d/dns.yml.sample
 @sample %%ETCDIR%%/settings.d/dns_dnscmd.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_libvirt.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/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/realm.yml.sample
 @sample %%ETCDIR%%/settings.d/templates.yml.sample
@@ -23,6 +34,7 @@ sbin/smart-proxy
 %%DATADIR%%/bundler.d/bmc.rb
 %%DATADIR%%/bundler.d/development.rb
 %%DATADIR%%/bundler.d/krb5.rb
+%%DATADIR%%/bundler.d/libvirt.rb
 %%DATADIR%%/bundler.d/puppet.rb
 %%DATADIR%%/bundler.d/test.rb
 %%DATADIR%%/bundler.d/windows.rb
@@ -31,38 +43,50 @@ sbin/smart-proxy
 %%DATADIR%%/extra/migrate_settings.rb
 %%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb
 %%DATADIR%%/extra/migrations/20150611000000_migrate_dns_settings.rb
+%%DATADIR%%/extra/migrations/20150826000000_migrate_dhcp_settings.rb
+%%DATADIR%%/extra/migrations/20160411000000_migrate_libvirt_settings.rb
+%%DATADIR%%/extra/migrations/20160413000000_migrate_puppet_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/default_di_wirings.rb
+%%DATADIR%%/lib/proxy/default_plugin_validators.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_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
+%%DATADIR%%/lib/proxy/log_buffer/decorator.rb
+%%DATADIR%%/lib/proxy/log_buffer/ring_buffer.rb
 %%DATADIR%%/lib/proxy/memory_store.rb
 %%DATADIR%%/lib/proxy/pluggable.rb
 %%DATADIR%%/lib/proxy/plugin.rb
+%%DATADIR%%/lib/proxy/plugin_initializer.rb
 %%DATADIR%%/lib/proxy/plugin_validators.rb
+%%DATADIR%%/lib/proxy/plugins.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/signal_handler.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%%/lib/smart_proxy_main.rb
+%%DATADIR%%/lib/webrick-patch.rb
 %%DATADIR%%/modules/bmc/base.rb
 %%DATADIR%%/modules/bmc/bmc.rb
 %%DATADIR%%/modules/bmc/bmc_api.rb
@@ -74,64 +98,115 @@ sbin/smart-proxy
 %%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/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/dhcp_common/dependency_injection/container.rb
+%%DATADIR%%/modules/dhcp_common/dependency_injection/dependencies.rb
+%%DATADIR%%/modules/dhcp_common/dhcp_common.rb
+%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb
+%%DATADIR%%/modules/dhcp_common/monkey_patches.rb
+%%DATADIR%%/modules/dhcp_common/record.rb
+%%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
+%%DATADIR%%/modules/dhcp_common/record/lease.rb
+%%DATADIR%%/modules/dhcp_common/record/reservation.rb
+%%DATADIR%%/modules/dhcp_common/server.rb
+%%DATADIR%%/modules/dhcp_common/subnet.rb
+%%DATADIR%%/modules/dhcp_common/subnet_service.rb
+%%DATADIR%%/modules/dhcp_isc/dependencies.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc_main.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc_plugin.rb
+%%DATADIR%%/modules/dhcp_libvirt/dependencies.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt_main.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt_plugin.rb
+%%DATADIR%%/modules/dhcp_libvirt/libvirt_dhcp_network.rb
+%%DATADIR%%/modules/dhcp_native_ms/dependencies.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms_main.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms_plugin.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_common/dependency_injection/container.rb
+%%DATADIR%%/modules/dns_common/dependency_injection/dependencies.rb
+%%DATADIR%%/modules/dns_common/dns_common.rb
+%%DATADIR%%/modules/dns_dnscmd/dependencies.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_libvirt/dependencies.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt_main.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt_plugin.rb
+%%DATADIR%%/modules/dns_libvirt/libvirt_dns_network.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/dns_nsupdate/nsupdate_dependencies.rb
+%%DATADIR%%/modules/dns_nsupdate/nsupdate_gss_dependencies.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/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/libvirt_common/libvirt_network.rb
+%%DATADIR%%/modules/logs/http_config.ru
+%%DATADIR%%/modules/logs/logs.rb
+%%DATADIR%%/modules/logs/logs_api.rb
+%%DATADIR%%/modules/logs/logs_plugin.rb
+%%DATADIR%%/modules/puppet_proxy/configuration_loader.rb
+%%DATADIR%%/modules/puppet_proxy/dependency_injection.rb
 %%DATADIR%%/modules/puppet_proxy/http_config.ru
-%%DATADIR%%/modules/puppet_proxy/initializer.rb
-%%DATADIR%%/modules/puppet_proxy/mcollective.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/puppet_proxy_common/api_request.rb
+%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb
+%%DATADIR%%/modules/puppet_proxy_common/environment.rb
+%%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_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
+%%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_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
+%%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/http_config.ru
 %%DATADIR%%/modules/puppetca/puppetca.rb
 %%DATADIR%%/modules/puppetca/puppetca_api.rb
@@ -146,6 +221,7 @@ sbin/smart-proxy
 %%DATADIR%%/modules/root/http_config.ru
 %%DATADIR%%/modules/root/root.rb
 %%DATADIR%%/modules/root/root_api.rb
+%%DATADIR%%/modules/root/root_module_loader.rb
 %%DATADIR%%/modules/root/root_plugin.rb
 %%DATADIR%%/modules/templates/http_config.ru
 %%DATADIR%%/modules/templates/template_proxy_request.rb
@@ -157,10 +233,5 @@ sbin/smart-proxy
 %%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%%