Remove httpd.proxy

inverse-inc · Jun 5, 2023 · e18b4c8 · e18b4c8
1 parent e529279
commit e18b4c8
Show file tree

Hide file tree

Showing 21 changed files with 0 additions and 469 deletions.
diff --git a/conf/I18N/api/en.po b/conf/I18N/api/en.po
@@ -13956,10 +13956,6 @@ msgstr ""
 msgid "Should httpd.portal be started? Keep enabled unless you know what you're doing."
 msgstr ""
 
-#: html/pfappserver/root/src/views/Configuration/services/_components/TheForm.vue:65
-msgid "Should httpd.proxy be started? Keep enabled unless you know what you're doing."
-msgstr ""
-
 #: html/pfappserver/root/src/views/Configuration/services/_components/TheForm.vue:70
 msgid "Should httpd.webservices be started? Keep enabled unless you know what you're doing."
 msgstr ""

diff --git a/conf/I18N/api/fr.po b/conf/I18N/api/fr.po
@@ -15308,14 +15308,6 @@ msgstr ""
 "Est-ce que httpd.portal doit être démarré ? Gardez le activé sauf si vous "
 "savez ce que vous faites."
 
-#: html/pfappserver/root/src/views/Configuration/services/_components/TheForm.vue:65
-msgid ""
-"Should httpd.proxy be started? Keep enabled unless you know what you're "
-"doing."
-msgstr ""
-"Est-ce que https.proxy doit être démarré ? Gardez le activé sauf si vous "
-"savez ce que vous faites."
-
 #: html/pfappserver/root/src/views/Configuration/services/_components/TheForm.vue:70
 msgid ""
 "Should httpd.webservices be started? Keep enabled unless you know what "

diff --git a/conf/documentation.conf b/conf/documentation.conf
@@ -287,13 +287,6 @@ description=<<EOT
 Should httpd.aaa be started? Keep enabled unless you know what you're doing.
 EOT
 
-[services.httpd_proxy]
-type=toggle
-options=enabled|disabled
-description=<<EOT
-Should httpd.proxy be started? Keep enabled unless you know what you're doing.
-EOT
-
 [services.pfcron]
 type=toggle
 options=enabled|disabled

diff --git a/conf/httpd.conf.d/httpd.proxy.tt.example b/conf/httpd.conf.d/httpd.proxy.tt.example
diff --git a/conf/log.conf.d/httpd.proxy.conf.example b/conf/log.conf.d/httpd.proxy.conf.example
diff --git a/conf/pf.conf.defaults b/conf/pf.conf.defaults
@@ -531,11 +531,6 @@ httpd_admin_dispatcher=enabled
 # Should httpd.aaa be started?
 httpd_aaa=enabled
 #
-# services.httpd_proxy
-#
-# Should httpd.proxy be started?
-httpd_proxy=enabled
-#
 # services.httpd_binary
 #
 # Location of the apache binary. Only necessary to change if you are not running the RPMed version.

diff --git a/conf/systemd/packetfence-httpd.proxy.service b/conf/systemd/packetfence-httpd.proxy.service
diff --git a/debian/packetfence.conffiles b/debian/packetfence.conffiles
@@ -71,7 +71,6 @@
 /usr/local/pf/conf/httpd.conf.d/httpd.aaa.tt
 /usr/local/pf/conf/httpd.conf.d/httpd.collector.tt
 /usr/local/pf/conf/httpd.conf.d/httpd.portal.tt
-/usr/local/pf/conf/httpd.conf.d/httpd.proxy.tt
 /usr/local/pf/conf/httpd.conf.d/log.conf
 /usr/local/pf/conf/radiusd/acct.conf
 /usr/local/pf/conf/radiusd/auth.conf

diff --git a/debian/patches/debianize.patch b/debian/patches/debianize.patch
@@ -24,15 +24,6 @@ index 5492ed51f1..d2237bc88e 100644
  #
  # services.radiusd_acct
  #
-@@ -518,7 +518,7 @@ httpd_proxy=enabled
- # services.httpd_binary
- #
- # Location of the apache binary. Only necessary to change if you are not running the RPMed version.
--httpd_binary=/usr/sbin/httpd
-+httpd_binary=/usr/sbin/apache2
- #
- # services.snmptrapd
- #
 @@ -616,7 +616,7 @@ openssl_binary=/usr/bin/openssl
  # services.arp_binary
  # 
@@ -83,23 +74,6 @@ index 59bbf12796..e06af92d10 100644
  ExecReload=/bin/kill -USR1 ${MAINPID}
  ExecStop=/bin/kill -WINCH ${MAINPID}
  # We want systemd to give httpd some time to finish gracefully, but still want
-diff --git a/conf/systemd/packetfence-httpd.proxy.service b/conf/systemd/packetfence-httpd.proxy.service
-index 8399433b77..078e1c5e64 100644
---- a/conf/systemd/packetfence-httpd.proxy.service
-+++ b/conf/systemd/packetfence-httpd.proxy.service
-@@ -10,9 +10,9 @@ After=packetfence-base.target packetfence-config.service packetfence-iptables.se
- StartLimitBurst=3
- StartLimitInterval=10
- Type=notify
--ExecStartPre=/usr/bin/rm -f /usr/local/pf/var/run/httpd.proxy.pid
--ExecStartPre=/bin/perl -I/usr/local/pf/lib -I/usr/local/pf/lib_perl/lib/perl5 '-Mpf::services::manager::httpd_proxy' -e 'pf::services::manager::httpd_proxy->new()->generateConfig()'
--ExecStart=/usr/sbin/httpd -f /usr/local/pf/var/conf/httpd.conf.d/httpd.proxy -DFOREGROUND  -Drhel
-+ExecStartPre=/bin/rm -f /usr/local/pf/var/run/httpd.proxy.pid
-+ExecStartPre=/usr/bin/perl -I/usr/local/pf/lib -I/usr/local/pf/lib_perl/lib/perl5 '-Mpf::services::manager::httpd_proxy' -e 'pf::services::manager::httpd_proxy->new()->generateConfig()'
-+ExecStart=/usr/sbin/apache2 -f /usr/local/pf/var/conf/httpd.conf.d/httpd.proxy -DFOREGROUND  -Ddebian
- ExecReload=/bin/kill -USR1 ${MAINPID}
- PrivateTmp=true
- Restart=on-failure
 diff --git a/conf/systemd/packetfence-iptables.service b/conf/systemd/packetfence-iptables.service
 index a3ac735600..be76136201 100644
 --- a/conf/systemd/packetfence-iptables.service

diff --git a/debian/rules b/debian/rules
@@ -213,7 +213,6 @@ binary-arch: build install
 	dh_installinit --name=packetfence-httpd.dispatcher
 	dh_installinit --name=packetfence-httpd.admin_dispatcher
 	dh_installinit --name=packetfence-httpd.portal
-	dh_installinit --name=packetfence-httpd.proxy
 	dh_installinit --name=packetfence-httpd.webservices
 	dh_installinit --name=packetfence-docker-iptables
 	dh_installinit --name=packetfence-iptables

diff --git a/docs/api/spec/components/schemas/configbase.yaml b/docs/api/spec/components/schemas/configbase.yaml
@@ -583,10 +583,6 @@ ConfigBase:
         description: Should httpd.portal be started? Keep enabled unless you know
           what you're doing.
         type: string
-      httpd_proxy:
-        description: Should httpd.proxy be started? Keep enabled unless you know what
-          you're doing.
-        type: string
       httpd_webservices:
         description: Should httpd.webservices be started? Keep enabled unless you
           know what you're doing.

diff --git a/go/caddy/log-tailer/logmeta.go b/go/caddy/log-tailer/logmeta.go
@@ -105,8 +105,6 @@ func NewRsyslogMetaEngine() *LogMetaEngine {
 			"httpd_collector_err":           &apacheErrorMetaExtractor,
 			"httpd_portal_access":           &apacheAccessMetaExtractor,
 			"httpd_portal_err":              &apacheErrorMetaExtractor,
-			"httpd_proxy_access":            &apacheAccessMetaExtractor,
-			"httpd_proxy_err":               &apacheErrorMetaExtractor,
 			"httpd_webservices_access":      &apacheAccessMetaExtractor,
 			"httpd_webservices_err":         &apacheErrorMetaExtractor,
 			"load_balancer":                 &freeradiusMetaExtractor,

diff --git a/go/pfconfigdriver/structs.go b/go/pfconfigdriver/structs.go
@@ -191,7 +191,6 @@ type PfConfServices struct {
 	HttpdAdminDispatcher string `json:"httpd_admin_dispatcher"`
 	HttpdDispatcher      string `json:"httpd_dispatcher"`
 	HttpdPortal          string `json:"httpd_portal"`
-	HttpdProxy           string `json:"httpd_proxy"`
 	HttpdWebservices     string `json:"httpd_webservices"`
 	Iptables             string `json:"iptables"`
 	Keepalived           string `json:"keepalived"`