new: great simplification of default compose thanks to upgrades in charms and compose.

compose.yml

@@ -7,67 +7,56 @@ mydomain.org:
   #   environment:
   #     TOTO: TATA
   #   image: mynewimage
-
   # options:
   #   workers: 4
-  relations:
-    web-proxy:
-      frontend:
-        #domain: mydomain.org
-        #server-aliases:
-        #  - mydomain2.org
-        # apache-custom-rules:
-        #   - |
-        #     ## Apache special rules ?
-        #     #
-        # ssl:
-        #   letsencrypt:
-        #     challenge-type: http  ## if 'dns', be sure to prepare 'env' correctly
-            # env:
-            #   ovh:
-            #     ## see: https://api.ovh.com/g934.first_step_with_api
-            #     entrypoint: ovh-eu
-            #     application:
-            #       key: XXX
-            #       secret: YYY
-            #     consumer_key: ZZZ
-        # ssl: true  ## simple auto-signed SSL certificates
-        # ssl:
-        #   ca-cert:
-        #     -----BEGIN CERTIFICATE-----
-        #     MIIF6TCCA9GgAwIBAgIQBeTcO5Q4qzuFl8umoZhQ4zANBgkqhkiG9w0BAQwFADCB
-        #     iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
-        #     ...
-        #     m9T8bJUox04FB6b9HbwZ4ui3uRGKLXASUoWNjDNKD/yZkuBjcNqllEdjB+dYxzFf
-        #     BT02Vf6Dsuimrdfp5gJ0iHRc2jTbkNJtUQoj1iM=
-        #     -----END CERTIFICATE-----
-        #     -----BEGIN CERTIFICATE-----
-        #     MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv
-        #     MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-        #     ...
-        #     Le9Gclc1Bb+7RrtubTeZtv8jkpHGbkD4jylW6l/VXxRTrPBPYer3IsynVgviuDQf
-        #     Jtl7GQVoP7o81DgGotPmjw7jtHFtQELFhLRAlSv0ZaBIefYdgWOWnU914Ph85I6p
-        #     0fKtirOMxyHNwu8=
-        #     -----END CERTIFICATE-----
-        #   cert: |
-        #     -----BEGIN CERTIFICATE-----
-        #     MIIF/TCCBOWgAwIBAgIRALUydpTpCApfYMuJchDJv5AwDQYJKoZIhvcNAQELBQAw
-        #     XzELMAkGA1UEBhMCRlIxDjAMBgNVBAgTBVBhcmlzMQ4wDAYDVQQHEwVQYXJpczEO
-        #     ...
-        #     lIxY9HJanHrWvjiz7+eToxXpZJtAPXTx5hxzcJrtWROlq7IJCMIhzr/EVA37jTCk
-        #     Xs5S6mr0T6Dqx6MQkPATSsEEJlLH5wq3DxXQcrMqnM/WHMRYUCkoTl37sXplflHe
-        #     jw==
-        #     -----END CERTIFICATE-----
-        #   key: |
-        #     -----BEGIN PRIVATE KEY-----
-        #     MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDONqqTCS4CiSi/
-        #     XeNpp2nUsq1299spGc7mlRs+PDrXNHscB5lUB5/yo2yEetYXrJacQ8n4NV9hkID5
-        #     ...
-        #     44eHDYsofcnRbidGR+QT8PQgiiDNCkbpi2u4QnLTs0w4oW+53ZTyHYEYF2rcLbIb
-        #     vRt4kR4KG6ULXrmsRA4WQjBDJ9vZw2aK+w==
-        #     -----END PRIVATE KEY-----
+  # relations:
+  #   web-proxy:
+  #     frontend:
+  #       #domain: mydomain.org
+  #       #server-aliases:
+  #       #  - mydomain2.org
+  #       # apache-custom-rules:
+  #       #   - |
+  #       #     ## Apache special rules ?
+  #       #     #
+  #       # ssl:
+  #       #   letsencrypt:
+  #       #     challenge-type: http  ## if 'dns', be sure to prepare 'env' correctly
+  #           # env:
+  #           #   ovh:
+  #           #     ## see: https://api.ovh.com/g934.first_step_with_api
+  #           #     entrypoint: ovh-eu
+  #           #     application:
+  #           #       key: XXX
+  #           #       secret: YYY
+  #           #     consumer_key: ZZZ
+  #       # ssl: true  ## simple auto-signed SSL certificates
+  #       # ssl:
+  #       #   ca-cert:
+  #       #     -----BEGIN CERTIFICATE-----
+  #       #     MIIF6TCCA9GgAwIBAgIQBeTcO5Q4qzuFl8umoZhQ4zANBgkqhkiG9w0BAQwFADCB
+  #       #     ...
+  #       #     BT02Vf6Dsuimrdfp5gJ0iHRc2jTbkNJtUQoj1iM=
+  #       #     -----END CERTIFICATE-----
+  #       #     -----BEGIN CERTIFICATE-----
+  #       #     MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv
+  #       #     ...
+  #       #     0fKtirOMxyHNwu8=
+  #       #     -----END CERTIFICATE-----
+  #       #   cert: |
+  #       #     -----BEGIN CERTIFICATE-----
+  #       #     MIIF/TCCBOWgAwIBAgIRALUydpTpCApfYMuJchDJv5AwDQYJKoZIhvcNAQELBQAw
+  #       #     ...
+  #       #     Xs5S6mr0T6Dqx6MQkPATSsEEJlLH5wq3DxXQcrMqnM/WHMRYUCkoTl37sXplflHe
+  #       #     jw==
+  #       #     -----END CERTIFICATE-----
+  #       #   key: |
+  #       #     -----BEGIN PRIVATE KEY-----
+  #       #     MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDONqqTCS4CiSi/
+  #       #     ...
+  #       #     vRt4kR4KG6ULXrmsRA4WQjBDJ9vZw2aK+w==
+  #       #     -----END PRIVATE KEY-----
 
-postgres:
 
 frontend:
   charm: apache
@@ -88,35 +77,12 @@ letsencrypt:
     #     consumer_key: ZZZ
 
 
-## Cron is present (even if empty) to add it automatically to any
-## ``compose up`` (without arguments).
-cron:
-
-
 logrotate:
 
 
 # mattermost.mydomain.org:
 #   charm: mattermost
-#   relations:
-#     web-proxy:
-#       frontend:
-#         apache-custom-rules: |
-#           ProxyPreserveHost On
-#
-#           # Set web sockets
-#           RewriteEngine On
-#           RewriteCond %{REQUEST_URI} /api/v[0-9]+/(users/)?websocket [NC,OR]
-#           RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
-#           RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
-#           RewriteRule .* ws://mattermost.mydomain.org:8000%{REQUEST_URI} [P,QSA,L]
-#     postgres-database: postgres
+
 
 # bitwarden.mydomain.org:
-#  relations:
-#    web-proxy:
-#      frontend:
-#        domain: bitwarden.mydomain.com
-#        ## We need to specify here the port as it can't be infered easily as
-#        ## there are 2 ports exposed by the image.
-#        target: bitwarden.mydomain.org:80
+#   charm: bitwarden