Staging instance, all changes can be removed at any time

Skip to content

Add an internal website to expose the static backup of the www

Vincent Sellier requested to merge www_backup into production

Expose a new "temporary" http only site to access the static backup of the corporate website

Related to swh/infra/websites/www.softwareheritage.org-gandi#4724

octocatalog diff 
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ Apache::Vhost[www-static-backup.internal.softwareheritage.org_non-ssl] =>
   parameters =>
     "access_log": true,
     "access_log_env_var": false,
     "access_log_file": false,
     "access_log_format": false,
     "access_log_pipe": false,
     "access_log_syslog": false,
     "add_listen": true,
     "additional_includes": [

     ],
     "apache_version": "2.4",
     "auth_kerb": false,
     "auth_oidc": false,
     "block": [

     ],
     "default_vhost": false,
     "define": {
     },
     "directories": [
       {
         "path": "/srv/softwareheritage/www-wordpress-static-backup/www.softwareh...
         "require": "all granted",
         "options": [
           "Indexes",
           "FollowSymLinks",
           "MultiViews"
         ]
       }
     ],
     "directoryindex": "",
     "docroot": "/srv/softwareheritage/www-wordpress-static-backup/www.softwarehe...
     "docroot_group": "root",
     "docroot_owner": "root",
     "ensure": "present",
     "error_documents": [

     ],
     "error_log": true,
     "h2_push_priority": [

     ],
     "h2_push_resource": [

     ],
     "ip_based": false,
     "krb_auth_realms": [

     ],
     "krb_authoritative": "on",
     "krb_method_k5passwd": "on",
     "krb_method_negotiate": "on",
     "krb_save_credentials": "off",
     "krb_servicename": "HTTP",
     "krb_verify_kdc": "on",
     "logroot": "/var/log/apache2",
     "logroot_ensure": "directory",
     "manage_docroot": false,
     "no_proxy_uris": [

     ],
     "no_proxy_uris_match": [

     ],
     "options": [
       "Indexes",
       "FollowSymLinks",
       "MultiViews"
     ],
     "override": [
       "None"
     ],
     "php_admin_flags": {
     },
     "php_admin_values": {
     },
     "php_flags": {
     },
     "php_values": {
     },
     "port": "80",
     "protocols": [

     ],
     "proxy_error_override": false,
     "proxy_preserve_host": false,
     "proxy_requests": false,
     "redirect_source": "/",
     "rewrite_inherit": false,
     "scriptaliases": [

     ],
     "serveraliases": [

     ],
     "servername": "www-static-backup.internal.softwareheritage.org",
     "setenv": [

     ],
     "setenvif": [

     ],
     "setenvifnocase": [

     ],
     "ssl": false,
     "ssl_cert": "/etc/ssl/certs/ssl-cert-snakeoil.pem",
     "ssl_key": "/etc/ssl/private/ssl-cert-snakeoil.key",
     "ssl_proxyengine": false,
     "ssl_reload_on_change": false,
     "suphp_addhandler": "x-httpd-php",
     "suphp_configpath": "/etc/php5/apache2",
     "suphp_engine": "off",
     "use_optional_includes": false,
     "use_port_for_filenames": false,
     "use_servername_for_filenames": false,
     "vhost_name": "*",
     "virtual_docroot": false,
     "virtual_use_default_docroot": false
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-access_log] =>
   parameters =>
     "content": "  CustomLog \"/var/log/apache2/www-static-backup.internal.softwa...
     "order": 100,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-apache-header] =>
   parameters =>
     "content": "# ************************************\n# Vhost template in modu...
     "order": 0,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-directories] =>
   parameters =>
     "content": "\n  ## Directories, there should at least be a declaration for /...
     "order": 60,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-docroot] =>
   parameters =>
     "content": "\n  ## Vhost docroot\n  DocumentRoot \"/srv/softwareheritage/www...
     "order": 10,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-file_footer] =>
   parameters =>
     "content": "</VirtualHost>\n",
     "order": 999,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-logging] =>
   parameters =>
     "content": "\n  ## Logging\n  ErrorLog \"/var/log/apache2/www-static-backup....
     "order": 80,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat::Fragment[www-static-backup.internal.softwareheritage.org_non-ssl-serversignature] =>
   parameters =>
     "content": "  ServerSignature Off\n",
     "order": 90,
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat[25-www-static-backup.internal.softwareheritage.org_non-ssl.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure": "present",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "order": "numeric",
     "owner": "root",
     "path": "/etc/apache2/sites-available/25-www-static-backup.internal.software...
     "replace": true,
     "show_diff": true,
     "warn": false
*******************************************
+ Concat_file[25-www-static-backup.internal.softwareheritage.org_non-ssl.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "root",
     "mode": "0644",
     "order": "numeric",
     "owner": "root",
     "path": "/etc/apache2/sites-available/25-www-static-backup.internal.software...
     "replace": true,
     "show_diff": true,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-access_log] =>
   parameters =>
     "content": "  CustomLog \"/var/log/apache2/www-static-backup.internal.softwa...
     "order": 100,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-apache-header] =>
   parameters =>
     "content": "# ************************************\n# Vhost template in modu...
     "order": 0,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-directories] =>
   parameters =>
     "content": "\n  ## Directories, there should at least be a declaration for /...
     "order": 60,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-docroot] =>
   parameters =>
     "content": "\n  ## Vhost docroot\n  DocumentRoot \"/srv/softwareheritage/www...
     "order": 10,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-file_footer] =>
   parameters =>
     "content": "</VirtualHost>\n",
     "order": 999,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-logging] =>
   parameters =>
     "content": "\n  ## Logging\n  ErrorLog \"/var/log/apache2/www-static-backup....
     "order": 80,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ Concat_fragment[www-static-backup.internal.softwareheritage.org_non-ssl-serversignature] =>
   parameters =>
     "content": "  ServerSignature Off\n",
     "order": 90,
     "tag": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf",
     "target": "25-www-static-backup.internal.softwareheritage.org_non-ssl.conf"
*******************************************
+ File[/etc/apache2/sites-enabled/25-www-static-backup.internal.softwareheritage.org_non-ssl.conf] =>
   parameters =>
     "ensure": "link",
     "group": "root",
     "mode": "0644",
     "notify": "Class[Apache::Service]",
     "owner": "root",
     "target": "/etc/apache2/sites-available/25-www-static-backup.internal.softwa...
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "zYgkGfNFM+ikXpzllsMpTcJBFaWZDmEY1gKlwWvPmJOP2moOiKNMVjrmaCnXE7r4UoOne+whf3AQk8+V9p7Ibw==";
      + secret "speih9geldeA3q3MVbEpwA7HR7eFcrIJG7Fl2ko7uLoKkX/VLqPJ8WJMPv/ndDdEOhHkgtQiVJuSdW14aqYFxw==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "lUiJplbRh8dhQUB+2fUWmAK9mQGFTcqIWWhm2OPmsvfoxRQrzImVl9ACh4ITg9n98U0BjA/kMj8D93byTLwhmQ==";
      + secret "U8kmx02xYrgQ4jnbmX/c5YnLNtIqK0odSDSCo0QkTciZ67yABRcn+hGjxdy0HbRHhtOU1V5jpNfnr3hF83gq3w==";
       };
*******************************************
  File[/etc/borgmatic/config.yaml] =>
   parameters =>
     content =>
      @@ -8,4 +8,5 @@
         - "/srv/softwareheritage/annex/annexroot"
         - "/srv/softwareheritage/bitbucket-archive"
      +  - "/srv/softwareheritage/www-wordpress-static-backup"
         - "/var/lib/prometheus"
         - "/dev"
*******************************************
+ Icinga2::Object::Service[www-static-backup http on pergamon.softwareheritage.org] =>
   parameters =>
     "apply": false,
     "assign": [

     ],
     "check_command": "http",
     "ensure": "present",
     "export_to": [
       "pergamon.softwareheritage.org"
     ],
     "host_name": "pergamon.softwareheritage.org",
     "ignore": [

     ],
     "import": [
       "generic-service"
     ],
     "order": 60,
     "prefix": false,
     "service_name": "www-static-backup https",
     "target": "/etc/icinga2/zones.d/master/exported-checks.conf",
     "template": false,
     "vars": {
       "http_address": "www-static-backup.internal.softwareheritage.org",
       "http_vhost": "www-static-backup.internal.softwareheritage.org",
       "http_ssl": true,
       "http_sni": true,
       "http_uri": "/",
       "http_onredirect": "sticky"
     }
*******************************************
+ Resource_record[www-static-backup/CNAME] =>
   parameters =>
     "data": "pergamon.internal.softwareheritage.org.",
     "keyfile": "/etc/bind/keys/local-update",
     "record": "www-static-backup.internal.softwareheritage.org",
     "type": "CNAME"
*******************************************
Edited by Vincent Sellier

Merge request reports