Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:remove-apache-extra into ubuntu-mirror-charm:master

[Paul Collins]

remove all of the apache early/late extra-config settings

[Haw Loeung (hloeung)]

lgtm

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 70647c0eae91f2d765ec6d9a6a62b9afc4e0698e

diff --git a/config.yaml b/config.yaml
index 2faeca9..582b256 100644
--- a/config.yaml
+++ b/config.yaml
@@ -87,14 +87,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_ubuntu_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_ubuntu_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_ubuntu_downstream_mirrors:
     default: ""
     type: "string"
@@ -152,14 +144,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_ubuntu-cloud-archive_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_ubuntu-cloud-archive_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_ubuntu-cloud-archive_downstream_mirrors:
     default: ""
     type: "string"
@@ -217,14 +201,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_releases_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_releases_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_releases_downstream_mirrors:
     default: ""
     type: "string"
@@ -282,14 +258,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_cloud-images_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_cloud-images_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_cloud-images_downstream_mirrors:
     default: ""
     type: "string"
@@ -347,14 +315,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_simple-streams_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_simple-streams_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_simple-streams_downstream_mirrors:
     default: ""
     type: "string"
@@ -412,14 +372,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_cdimage_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_cdimage_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_cdimage_downstream_mirrors:
     default: ""
     type: "string"
@@ -477,14 +429,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_ports_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_ports_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_ports_downstream_mirrors:
     default: ""
     type: "string"
@@ -542,14 +486,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_maas-images_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_maas-images_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_maas-images_downstream_mirrors:
     default: ""
     type: "string"
@@ -617,14 +553,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_linuxcontainers_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_linuxcontainers_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_linuxcontainers_downstream_mirrors:
     default: ""
     type: "string"
@@ -682,14 +610,6 @@ options:
     default: ""
     type: string
     description: "A base64 string containing the ssh trigger public key"
-  mirror_old-releases_apache_early_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included early in the config file"
-  mirror_old-releases_apache_late_extra:
-    default: ""
-    type: string
-    description: "A base64 string containing apache configuration options to be included late in the config file"
   mirror_old-releases_downstream_mirrors:
     default: ""
     type: "string"
diff --git a/hooks/Config.py b/hooks/Config.py
index 5f41727..7e5523e 100755
--- a/hooks/Config.py
+++ b/hooks/Config.py
@@ -22,8 +22,6 @@ ROLE_CONFIG_KEYS = [
     "rsync_module",
     "sync_time",
     "trigger",
-    "apache_late_extra",
-    "apache_early_extra",
     "downstream_mirrors",
     "trigger_keyfile",
 ]
@@ -151,7 +149,7 @@ class Config:
                 log("CHARM: No config value for {}".format(config_key))
                 raise ValueError
 
-            if key in ["trigger", "apache_late_extra", "apache_early_extra"]:
+            if key == "trigger":
                 # Base64 expansion needed
                 try:
                     map[key] = str(base64.b64decode(value))
diff --git a/templates/apache-cdimage.tmpl b/templates/apache-cdimage.tmpl
index aaf8502..993a456 100644
--- a/templates/apache-cdimage.tmpl
+++ b/templates/apache-cdimage.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -32,7 +31,6 @@ ${apache_early_extra}
         IndexIgnore favicon.ico
         AllowOverride FileInfo Indexes
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-cloud-images.tmpl b/templates/apache-cloud-images.tmpl
index 70118bd..d5cf82f 100644
--- a/templates/apache-cloud-images.tmpl
+++ b/templates/apache-cloud-images.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -32,7 +31,6 @@ ${apache_early_extra}
         IndexIgnore favicon.ico
         AllowOverride FileInfo Indexes
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-maas-images.tmpl b/templates/apache-maas-images.tmpl
index d9357d9..8263441 100644
--- a/templates/apache-maas-images.tmpl
+++ b/templates/apache-maas-images.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -34,7 +33,6 @@ ${apache_early_extra}
         IndexIgnore favicon.ico
         AllowOverride FileInfo Indexes
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-old-releases.tmpl b/templates/apache-old-releases.tmpl
index 2c2df87..fcf4538 100644
--- a/templates/apache-old-releases.tmpl
+++ b/templates/apache-old-releases.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -50,7 +49,6 @@ ${apache_early_extra}
         Options +Indexes +FollowSymLinks
         IndexIgnore favicon.ico
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-ports.tmpl b/templates/apache-ports.tmpl
index 682ad9e..c65f582 100644
--- a/templates/apache-ports.tmpl
+++ b/templates/apache-ports.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -31,7 +30,6 @@ ${apache_early_extra}
         Options +Indexes +FollowSymLinks
         IndexIgnore favicon.ico
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-releases.tmpl b/templates/apache-releases.tmpl
index 93edd16..3b4761d 100644
--- a/templates/apache-releases.tmpl
+++ b/templates/apache-releases.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -32,7 +31,6 @@ ${apache_early_extra}
         IndexIgnore favicon.ico
         AllowOverride FileInfo Indexes
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-simple-streams.tmpl b/templates/apache-simple-streams.tmpl
index 43df003..fb90169 100644
--- a/templates/apache-simple-streams.tmpl
+++ b/templates/apache-simple-streams.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -35,7 +34,6 @@ ${apache_early_extra}
 
     # cRT#130349
     AddOutputFilterByType DEFLATE application/json
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-ubuntu-cloud-archive.tmpl b/templates/apache-ubuntu-cloud-archive.tmpl
index b87f5bf..8d76ab1 100644
--- a/templates/apache-ubuntu-cloud-archive.tmpl
+++ b/templates/apache-ubuntu-cloud-archive.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -51,7 +50,6 @@ ${apache_early_extra}
         Options +Indexes +FollowSymLinks
         IndexIgnore favicon.ico
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for
diff --git a/templates/apache-ubuntu.tmpl b/templates/apache-ubuntu.tmpl
index 5dbb4fb..be7c7fd 100644
--- a/templates/apache-ubuntu.tmpl
+++ b/templates/apache-ubuntu.tmpl
@@ -1,7 +1,6 @@
 #for $port in $ports
 #set $sockets = ' '.join(sorted(['{}:{}'.format(address, port) for address in $addresses]))
 <VirtualHost ${sockets}>
-${apache_early_extra}
     ServerName ${name}
     #for $alias in $aliases
     ServerAlias ${alias}
@@ -55,7 +54,6 @@ ${apache_early_extra}
         Options +Indexes +FollowSymLinks
         IndexIgnore favicon.ico
     </Directory>
-${apache_late_extra}
 </VirtualHost>
 
 #end for