puppet: Allow profiles to override zulip_ops::profile::base.

puppet/zulip_ops/manifests/profile/chat_zulip_org.pp

@@ -1,9 +1,8 @@
-class zulip_ops::profile::chat_zulip_org {
+class zulip_ops::profile::chat_zulip_org inherits zulip_ops::profile::base {
   include zulip::profile::standalone
   include zulip::postfix_localmail
   include zulip::hooks::sentry
 
-  include zulip_ops::profile::base
   include zulip_ops::app_frontend_monitoring
   include zulip_ops::prometheus::redis
   include zulip_ops::prometheus::postgresql

puppet/zulip_ops/manifests/profile/grafana.pp

@@ -1,7 +1,7 @@
 # @summary Observability using Grafana
 #
-class zulip_ops::profile::grafana {
-  include zulip_ops::profile::base
+class zulip_ops::profile::grafana inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $version = $zulip::common::versions['grafana']['version']

puppet/zulip_ops/manifests/profile/munin_server.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::munin_server {
-  include zulip_ops::profile::base
+class zulip_ops::profile::munin_server inherits zulip_ops::profile::base {
+
   include zulip_ops::apache
   include zulip::supervisor
 

puppet/zulip_ops/manifests/profile/nagios.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::nagios {
-  include zulip_ops::profile::base
+class zulip_ops::profile::nagios inherits zulip_ops::profile::base {
+
   include zulip_ops::apache
 
   zulip::ssh_keys { 'nagios': }

puppet/zulip_ops/manifests/profile/postgresql.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::postgresql {
-  include zulip_ops::profile::base
+class zulip_ops::profile::postgresql inherits zulip_ops::profile::base {
+
   include zulip::profile::postgresql
   include zulip_ops::teleport::db
   include zulip_ops::prometheus::postgresql

puppet/zulip_ops/manifests/profile/prod_app_frontend.pp

@@ -1,5 +1,4 @@
-class zulip_ops::profile::prod_app_frontend {
-  include zulip_ops::profile::base
+class zulip_ops::profile::prod_app_frontend inherits zulip_ops::profile::base {
   include zulip_ops::app_frontend
   include zulip::hooks::zulip_notify
 

puppet/zulip_ops/manifests/profile/prometheus_server.pp

@@ -2,8 +2,8 @@
 #
 # Only one instance is necessary.
 #
-class zulip_ops::profile::prometheus_server {
-  include zulip_ops::profile::base
+class zulip_ops::profile::prometheus_server inherits zulip_ops::profile::base {
+
   include zulip_ops::prometheus::base
 
   # This blackbox monitoring of the backup system runs locally

puppet/zulip_ops/manifests/profile/smokescreen.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::smokescreen {
-  include zulip_ops::profile::base
+class zulip_ops::profile::smokescreen inherits zulip_ops::profile::base {
+
 
   include zulip::profile::smokescreen
   zulip_ops::firewall_allow { 'smokescreen': port => '4750' }

puppet/zulip_ops/manifests/profile/staging_app_frontend.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::staging_app_frontend {
-  include zulip_ops::profile::base
+class zulip_ops::profile::staging_app_frontend inherits zulip_ops::profile::base {
+
   include zulip_ops::app_frontend
 
   file { '/etc/nginx/sites-available/zulip-staging':

puppet/zulip_ops/manifests/profile/teleport.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::teleport {
-  include zulip_ops::profile::base
+class zulip_ops::profile::teleport inherits zulip_ops::profile::base {
+
 
   file { '/etc/teleport_server.yaml':
     owner  => 'root',

puppet/zulip_ops/manifests/profile/zmirror.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::zmirror {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zmirror inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror

puppet/zulip_ops/manifests/profile/zmirror_personals.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::zmirror_personals {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zmirror_personals inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror

puppet/zulip_ops/manifests/profile/zulipbot_zulip_org.pp

@@ -1,5 +1,5 @@
-class zulip_ops::profile::zulipbot_zulip_org {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zulipbot_zulip_org inherits zulip_ops::profile::base {
+
   zulip_ops::firewall_allow { 'http': }
   zulip_ops::firewall_allow { 'https': }