From 17c36af887d3f0099e2a03355918bbf59de131f8 Mon Sep 17 00:00:00 2001 From: Joe Hoyle Date: Thu, 21 Mar 2019 16:29:34 +0700 Subject: [PATCH] Switch to altis.dev domains --- docker/README.md | 22 +---- docker/bin/install.sh | 41 --------- docker/conf/dnsmasq.conf | 1 - docker/conf/resolver-hmdocker | 1 - docker/conf/traefik.toml | 6 +- docker/docker-compose.yml | 13 +-- docker/sni/cert/altis.pem | 101 ++++++++++++++++++++++ docker/sni/cert/hm-stack.hmdocker.pem | 24 ------ docker/sni/key/altis.pem | 27 ++++++ docker/sni/key/hm-stack.hmdocker.pem | 28 ------- docker/ssl.cert | 116 ++++++++++++++++++++++---- docker/ssl.key | 50 +++++------ inc/Composer/Command.php | 5 -- wp-config.php | 4 +- 14 files changed, 266 insertions(+), 173 deletions(-) delete mode 100755 docker/bin/install.sh delete mode 100644 docker/conf/dnsmasq.conf delete mode 100644 docker/conf/resolver-hmdocker create mode 100644 docker/sni/cert/altis.pem delete mode 100644 docker/sni/cert/hm-stack.hmdocker.pem create mode 100644 docker/sni/key/altis.pem delete mode 100644 docker/sni/key/hm-stack.hmdocker.pem diff --git a/docker/README.md b/docker/README.md index 16ea121f..f537887c 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,11 +1,3 @@ -## DNS Proxy Installation - -Let's install some dependencies! The following script will install `dnsmasq` and configure a `.hmdocker` domain locally: - -``` -bin/install.sh -``` - ## Usage ``` @@ -20,17 +12,5 @@ If you wish to re-use this configuration, you'll need to use the `COMPOSE_PROJEC VOLUME=/path/to/wordpress/project COMPOSE_PROJECT_NAME=some-project docker-compose up ``` -## Local DNS - -The proxy will monitor Docker for containers and map their localhost:port combination to a DNS address, formulated as `{service}.{project}.{domain}`. Traefik is configured to use `.hmdocker` as the `{domain}`. By default, Docker Compose will use the name of the directory the `docker-compose.yml` file lives in for the name of the Project, which gets mapped to `{project}`. If this repo was cloned as a directory named `base`, the `nginx` service's domain Traefik generates would be `nginx.base.hmdocker`. It's also possible to tell Traefik to use another domain name, via `label`s: - -```yaml -# Abreviated: -services: - nginx: - labels: - - "traefik.frontend.rule=Host:${COMPOSE_PROJECT_NAME:-default}.hmdocker" -``` - -We can now pass the `COMPOSE_PROJECT_NAME` environment variable when running `docker-compose up`, and it will use that value as the name of the domain. The above example will use `COMPOSE_PROJECT_NAME` for the name of the domain, or `default` if none is passed. For instance, if we pass `COMPOSE_PROJECT_NAME=foobar`, the domain Traefik uses is `foobar.hmdocker`. +We can now pass the `COMPOSE_PROJECT_NAME` environment variable when running `docker-compose up`, and it will use that value as the name of the domain. The above example will use `COMPOSE_PROJECT_NAME` for the name of the domain, or `default` if none is passed. For instance, if we pass `COMPOSE_PROJECT_NAME=foobar`, the domain Traefik uses is `foobar.altis.dev`. diff --git a/docker/bin/install.sh b/docker/bin/install.sh deleted file mode 100755 index 1e536c34..00000000 --- a/docker/bin/install.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -function get_abs_filename () { - # $1 : relative filename - echo "$(cd "$1" && pwd)" -} - -BASE_DIR="$(get_abs_filename "${BASH_SOURCE%/*}/../")" -DNSMASQ_CONF=/usr/local/etc/dnsmasq.conf -DNSMASQ_CONF_LINE="conf-file=${BASE_DIR}/conf/dnsmasq.conf" - -if (brew list | grep -q dnsmasq); then - echo "dnsmasq is already installed. Ensuring process is stopped..." - brew services stop dnsmasq || true - sudo brew services stop dnsmasq || true -else - echo "Installing dnsmasq" - brew install dnsmasq -fi - -if grep -Fxq "$DNSMASQ_CONF_LINE" "$DNSMASQ_CONF"; then - echo "dnsmasq configuration in place. Moving on..." -else - echo "Adding relevant config to ${DNSMASQ_CONF}" - echo "$DNSMASQ_CONF_LINE" >> "$DNSMASQ_CONF" -fi - -echo "Creating /etc/resolver" -sudo mkdir -p /etc/resolver - -echo "Linking ${BASE_DIR}/conf/resolver-hmdocker to /etc/resolver/hmdocker" -sudo ln -sf "${BASE_DIR}/conf/resolver-hmdocker" /etc/resolver/hmdocker - -echo "Clearing DNS cache" -sudo killall -HUP mDNSResponder -sudo killall mDNSResponderHelper -sudo dscacheutil -flushcache - -echo "Registering dnsmasq to start at boot and starting" -# dnsmasq is started with sudo to ensure it can use port 53 -sudo brew services start dnsmasq diff --git a/docker/conf/dnsmasq.conf b/docker/conf/dnsmasq.conf deleted file mode 100644 index 52c43c74..00000000 --- a/docker/conf/dnsmasq.conf +++ /dev/null @@ -1 +0,0 @@ -address=/hmdocker/127.0.0.1 diff --git a/docker/conf/resolver-hmdocker b/docker/conf/resolver-hmdocker deleted file mode 100644 index bbc8559c..00000000 --- a/docker/conf/resolver-hmdocker +++ /dev/null @@ -1 +0,0 @@ -nameserver 127.0.0.1 diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml index c41177c2..2c865062 100644 --- a/docker/conf/traefik.toml +++ b/docker/conf/traefik.toml @@ -39,8 +39,8 @@ insecureSkipVerify = true address = ":443" [entryPoints.https.tls] [[entryPoints.https.tls.certificates]] - certFile = "/etc/traefik/sni/cert/hm-stack.hmdocker.pem" - keyFile = "/etc/traefik/sni/key/hm-stack.hmdocker.pem" + certFile = "/etc/traefik/sni/cert/altis.pem" + keyFile = "/etc/traefik/sni/key/altis.pem" [web] address = ":8080" @@ -153,7 +153,7 @@ address = ":8080" # Optional # Default: "" # -domain = "hmdocker" +domain = "altis.dev" # Expose containers by default in traefik # diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ff9a4482..c426cebc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -33,11 +33,11 @@ x-php: &php AWS_XRAY_DAEMON_HOST: xray S3_UPLOADS_ENDPOINT: http://s3.localhost:8000/ S3_UPLOADS_BUCKET: s3-${COMPOSE_PROJECT_NAME:-default} - S3_UPLOADS_BUCKET_URL: http://s3-${COMPOSE_PROJECT_NAME:-default}.hmdocker + S3_UPLOADS_BUCKET_URL: http://s3-${COMPOSE_PROJECT_NAME:-default}.altis.dev S3_UPLOADS_KEY: not-needed S3_UPLOADS_SECRET: not-needed S3_UPLOADS_REGION: not-needed - TACHYON_URL: http://tachyon-${COMPOSE_PROJECT_NAME:-default}.hmdocker/uploads + TACHYON_URL: http://tachyon-${COMPOSE_PROJECT_NAME:-default}.altis.dev/uploads services: db: @@ -77,7 +77,7 @@ services: - "traefik.port=8080" - "traefik.protocol=https" - "traefik.docker.network=proxy" - - "traefik.frontend.rule=HostRegexp:${COMPOSE_PROJECT_NAME:-default}.hmdocker,{subdomain:[a-z.-_]+}.${COMPOSE_PROJECT_NAME:-default}.hmdocker" + - "traefik.frontend.rule=HostRegexp:${COMPOSE_PROJECT_NAME:-default}.altis.dev,{subdomain:[a-z.-_]+}.${COMPOSE_PROJECT_NAME:-default}.altis.dev" xray: image: amazon/aws-xray-daemon ports: @@ -92,6 +92,7 @@ services: <<: *php entrypoint: - /usr/local/bin/cavalcade + user: "nobody:nobody" elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4 ulimits: @@ -108,7 +109,7 @@ services: - "traefik.port=9200" - "traefik.protocol=http" - "traefik.docker.network=proxy" - - "traefik.frontend.rule=HostRegexp:elasticsearch.${COMPOSE_PROJECT_NAME:-default}.hmdocker,{subdomain:[a-z.-_]+}.${COMPOSE_PROJECT_NAME:-default}.hmdocker" + - "traefik.frontend.rule=HostRegexp:elasticsearch.${COMPOSE_PROJECT_NAME:-default}.altis.dev,{subdomain:[a-z.-_]+}.${COMPOSE_PROJECT_NAME:-default}.altis.dev" s3: image: fingershock/fakes3 volumes: @@ -121,7 +122,7 @@ services: - "traefik.port=8000" - "traefik.protocol=http" - "traefik.docker.network=proxy" - - "traefik.frontend.rule=HostRegexp:s3-${COMPOSE_PROJECT_NAME:-default}.hmdocker" + - "traefik.frontend.rule=HostRegexp:s3-${COMPOSE_PROJECT_NAME:-default}.altis.dev" tachyon: image: humanmade/tachyon ports: @@ -132,7 +133,7 @@ services: - "traefik.port=8080" - "traefik.protocol=http" - "traefik.docker.network=proxy" - - "traefik.frontend.rule=HostRegexp:tachyon-${COMPOSE_PROJECT_NAME:-default}.hmdocker" + - "traefik.frontend.rule=HostRegexp:tachyon-${COMPOSE_PROJECT_NAME:-default}.altis.dev" environment: AWS_REGION: not-needed AWS_S3_BUCKET: s3-${COMPOSE_PROJECT_NAME:-default} diff --git a/docker/sni/cert/altis.pem b/docker/sni/cert/altis.pem new file mode 100644 index 00000000..4f0f1a8e --- /dev/null +++ b/docker/sni/cert/altis.pem @@ -0,0 +1,101 @@ +-----BEGIN CERTIFICATE----- +MIIF8TCCBNmgAwIBAgIRAKnmCNsI3vnqJ1XBsFkZGw8wDQYJKoZIhvcNAQELBQAw +gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE +AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD +QTAeFw0xOTAzMDcwMDAwMDBaFw0yMDAzMDcyMzU5NTlaMFgxITAfBgNVBAsTGERv +bWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UECxMUUG9zaXRpdmVTU0wgV2ls +ZGNhcmQxFDASBgNVBAMMCyouYWx0aXMuZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAw68IFsiDGEVjKm+ZVu6RipVPBdNH9zURyhGteuZhW++/aFrz +oFnaePugtL09adRg1NJ3MmQ3xNLH129WZJpW1KCH18MG90SK4FHxEolxk4HvTlRF +iEy/WHc9OkDhq8tOeDDeKmbdrSDtfcaB67+g1ucf4VzafUYcriwk5YHn8oBexbwC +gHwNZrz5lHJXsKPqbQjMt2lNqCA9uS4Qkktgl78dUNOGxE7JI/s3kE2QfCynFJK7 +Rm52RuBohcz5IaEJ5TDNovBU5bnHMBjBb36LBmZhK6AVw7dyLp5ir/oEMKDrJZxi +2cSdi4JPM65OGlOhX0+H5dXOIa+GTxBvC2jdMwIDAQABo4ICfDCCAngwHwYDVR0j +BBgwFoAUjYxexFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFIa0dxxwyd3EXJa+ +ILpz1G5aXuH8MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIH +MCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAEC +ATCBhAYIKwYBBQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3Rp +Z28uY29tL1NlY3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0Eu +Y3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTAhBgNVHREE +GjAYggsqLmFsdGlzLmRldoIJYWx0aXMuZGV2MIIBAgYKKwYBBAHWeQIEAgSB8wSB +8ADuAHUAu9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFpVyxpwwAA +BAMARjBEAiAc4qqqXvHCY91JBoZ/jpFj9/A7URJnRVLTWmkW3KfIuQIgIVa/3yyP +tEy1+LQPee22x7SGN67XI8qNeAvZLc7rVBMAdQBep3P531bA57U2SH3QSeAyepGa +DIShEhKEGHWWgXFFWAAAAWlXLGoSAAAEAwBGMEQCIEooOeJqL2tswMe/XwKo1F2S +dvusT/pqQ5xfuPUVTgXvAiAeL60Z5d6ULlCEqNVytdBrHCLQu1M3GrbM8M98/YSr +7jANBgkqhkiG9w0BAQsFAAOCAQEAK4uk8dwUjmJNDbF6oxOfTNuuDCPq9ZSnY/5V +yw2m1jPSHIJyQTQKPHJk4mzulnBiQD48q4EHN7nJPAFk6SjvR8FYovgyQB6vKDoK +/t99zVOYwDBWGKhhgMed2SZcUFAg6xf0RHT5JRkSnSjfX3fQTCWHsGNIw2CVB+R8 +Dv+dsDM9JXqLAs4j7HersH1D0Cf9TDDK8FGRjXatGc7bE5tjlewkQZQY18Iu3Z09 +wGtz/jm6QNhR6P0Fb3TVHyRzULWquNaeQaTgHc0qB5ct4QJmpDedc09aQWymOgBE +A7GGwki+s4+yGOsL+kQedTKmR/HS3NqSVXZVWnBQ5rkVJNkgEA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx +MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBjzELMAkGA1UEBhMCR0IxGzAZBgNV +BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE +ChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5TZWN0aWdvIFJTQSBEb21haW4g +VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA1nMz1tc8INAA0hdFuNY+B6I/x0HuMjDJsGz99J/LEpgPLT+N +TQEMgg8Xf2Iu6bhIefsWg06t1zIlk7cHv7lQP6lMw0Aq6Tn/2YHKHxYyQdqAJrkj +eocgHuP/IJo8lURvh3UGkEC0MpMWCRAIIz7S3YcPb11RFGoKacVPAXJpz9OTTG0E +oKMbgn6xmrntxZ7FN3ifmgg0+1YuWMQJDgZkW7w33PGfKGioVrCSo1yfu4iYCBsk +Haswha6vsC6eep3BwEIc4gLw6uBK0u+QDrTBQBbwb4VCSmT3pDCg/r8uoydajotY +uK3DGReEY+1vVv2Dy2A0xHS+5p3b4eTlygxfFQIDAQABo4IBbjCCAWowHwYDVR0j +BBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFI2MXsRUrYrhd+mb ++ZsF4bgBjWHhMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYGBFUdIAAw +CAYGZ4EMAQIBMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0 +LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2Bggr +BgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNv +bS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDov +L29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAMr9hvQ5Iw0/H +ukdN+Jx4GQHcEx2Ab/zDcLRSmjEzmldS+zGea6TvVKqJjUAXaPgREHzSyrHxVYbH +7rM2kYb2OVG/Rr8PoLq0935JxCo2F57kaDl6r5ROVm+yezu/Coa9zcV3HAO4OLGi +H19+24rcRki2aArPsrW04jTkZ6k4Zgle0rj8nSg6F0AnwnJOKf0hPHzPE/uWLMUx +RP0T7dWbqWlod3zu4f+k+TY4CFM5ooQ0nBnzvg6s1SQ36yOoeNDT5++SR2RiOSLv +xvcRviKFxmZEJCaOEDKNyJOuB56DPi/Z+fVGjmO+wea03KbNIaiGCpXZLoUmGv38 +sbZXQm2V0TP2ORQGgkE49Y9Y3IBbpNV9lXj9p5v//cWoaasm56ekBYdbqbe4oyAL +l6lFhd2zi+WJN44pDfwGF/Y4QA5C5BIG+3vzxhFoYt/jmPQT2BVPi7Fp2RBgvGQq +6jG35LWjOhSbJuMLe/0CjraZwTiXWTb2qHSihrZe68Zk6s+go/lunrotEbaGmAhY +LcmsJWTyXnW0OMGuf1pGg+pRyrbxmRE1a6Vqe8YAsOf4vmSyrcjC8azjUeqkk+B5 +yOGBQMkKW+ESPMFgKuOXwIlCypTPRpgSabuY0MLTDXJLR27lk8QyKGOHQ+SwMj4K +00u/I5sUKUErmgQfky3xxzlIPK1aEn8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk +ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF +eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow +gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK +ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD +VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sIs9CsVw127c0n00yt +UINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnGvDoZtF+mvX2do2NC +tnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQIjy8/hPwhxR79uQf +jtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfbIWax1Jt4A8BQOujM +8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0tyA9yn8iNK5+O2hm +AUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97Exwzf4TKuzJM7UXiV +Z4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNVicQNwZNUMBkTrNN9 +N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5D9kCnusSTJV882sF +qV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJWBp/kjbmUZIO8yZ9 +HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ5lhCLkMaTLTwJUdZ ++gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzGKAgEJTm4Diup8kyX +HAc/DVL17e8vgg8CAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTv +A73gJMtUGjAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/ +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1Ud +HwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4 +dGVybmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0 +dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAJNl9jeD +lQ9ew4IcH9Z35zyKwKoJ8OkLJvHgwmp1ocd5yblSYMgpEg7wrQPWCcR23+WmgZWn +RtqCV6mVksW2jwMibDN3wXsyF24HzloUQToFJBv2FAY7qCUkDrvMKnXduXBBP3zQ +YzYhBx9G/2CkkeFnvN4ffhkUyWNnkepnB2u0j4vAbkN9w6GAbLIevFOFfdyQoaS8 +Le9Gclc1Bb+7RrtubTeZtv8jkpHGbkD4jylW6l/VXxRTrPBPYer3IsynVgviuDQf +Jtl7GQVoP7o81DgGotPmjw7jtHFtQELFhLRAlSv0ZaBIefYdgWOWnU914Ph85I6p +0fKtirOMxyHNwu8= +-----END CERTIFICATE----- diff --git a/docker/sni/cert/hm-stack.hmdocker.pem b/docker/sni/cert/hm-stack.hmdocker.pem deleted file mode 100644 index d659e3fd..00000000 --- a/docker/sni/cert/hm-stack.hmdocker.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEAjCCAmqgAwIBAgIQfuUI+i2XiI4b5hPEDbYcjDANBgkqhkiG9w0BAQsFADBO -MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExLDAqBgNVBAsMI2FhbmdA -TmF0aGFuaWVscy1NYWNCb29rLVByby0yLmxvY2FsMB4XDTE4MDcxMzE5MjM1NFoX -DTI4MDcxMzE5MjM1NFowVzEnMCUGA1UEChMebWtjZXJ0IGRldmVsb3BtZW50IGNl -cnRpZmljYXRlMSwwKgYDVQQLDCNhYW5nQE5hdGhhbmllbHMtTWFjQm9vay1Qcm8t -Mi5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPIez2bdssPa -hyx+Zn34pqoTGGeaTgfZVENGFioY7ivpNNb3xVe5GTijI2USqwgeHRm11K3UTL6t -fIFbzedn8y8eiy/Ghthe5HvreIO5V2JSBKplzff3MUCqE4/mG/kq93AuYuhgfBpE -3MXcupKAxZwTFQTksOs8jlEicCwh2jn6rDEFF9EKWAEwXIKae0o1jy3J4n/Zx89B -Okgc8Gy1OItMrkQ2CA0/UVL69mPwjX8iRHwG1Ct4HCmHFRKTNnePxzCq1wmSbFFx -tPVsWXWeDbIMQmJNnVYG6PBGmUs2KYI3VQngCYgedECHXD+by7OKyh6lwI40lEZh -J1B7sB/avEMCAwEAAaNTMFEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsG -AQUFBwMBMAwGA1UdEwEB/wQCMAAwHAYDVR0RBBUwE4IRaG0tc3RhY2suaG1kb2Nr -ZXIwDQYJKoZIhvcNAQELBQADggGBAE1gkeVqpoofZfa6p7S2fswu4I3v/ZqD/tZZ -IdC3g0reyGrcb2lIPgHGpYojdGMBF8Eh0MVYHcFjATZjDIKXEzzISYHgIE3rjmgx -F2dw3UmPP9lN00Zoi93AYOamibORo//SeRG5RShYtz6rS4no+aSF4ykqPViaKbLH -m5XweS4zzyV9gYK4MNcxpmBVMfv0yREnbhPIKzz9g2zFyKJnxqJSWo7Soft/K6Am -MKA6Y3vVHbIDL1LQ5wzrJ/R0RIiENuw/vCwOAy2blQgIy37OOH8y0of36YZv2CPf -UlHD3JTaHZ2npdd1EwRWQD+OJ1ibysKEPUyvA8HBgaGu08EipeuydkBtsgxwJ62S -eOxmYo4vtejWwkkKF4f5Jhakub8ZitbzhYNxYbjrkc4WvtEV9HGl/SFjk4QgWY/+ -S2ycn0cmWB1h8mRN38+u9+avNHyxS8Bt3Xq/ymv8atek+ZUdoPGHx3yLo50Wh9fD -r/eyOnYZ/oGnmtpYzDS2mcgJUEhITQ== ------END CERTIFICATE----- diff --git a/docker/sni/key/altis.pem b/docker/sni/key/altis.pem new file mode 100644 index 00000000..deef4842 --- /dev/null +++ b/docker/sni/key/altis.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAw68IFsiDGEVjKm+ZVu6RipVPBdNH9zURyhGteuZhW++/aFrz +oFnaePugtL09adRg1NJ3MmQ3xNLH129WZJpW1KCH18MG90SK4FHxEolxk4HvTlRF +iEy/WHc9OkDhq8tOeDDeKmbdrSDtfcaB67+g1ucf4VzafUYcriwk5YHn8oBexbwC +gHwNZrz5lHJXsKPqbQjMt2lNqCA9uS4Qkktgl78dUNOGxE7JI/s3kE2QfCynFJK7 +Rm52RuBohcz5IaEJ5TDNovBU5bnHMBjBb36LBmZhK6AVw7dyLp5ir/oEMKDrJZxi +2cSdi4JPM65OGlOhX0+H5dXOIa+GTxBvC2jdMwIDAQABAoIBABb21IEv+MqBYhjZ +zen4x1W3HfX2DI0DSlonZu90V9qdMR5DBjI8OTpXdU2go7NmvBJdvKVKQ40ym0c6 +Bq55ulTrneWBOrEL9yxKEXt2a8C+z+GmXB6Zux7bp3DNqm4pxsSuH3RkbAFkStqm +0Bple6+cog4lgnKPJtB917qjWyAHIfGH5RiLp3WM7qGkKfyad0NPSMQnIC7/HTiP +MUEtc3jmlpqHd+CWa1DaSeubsXMCWzbMx48YQPfQ1bbrV3cslCxX90NpRox0keuu +uy9ppXDysR6C9puu/biy1rrurkH0Eq+6XtIhKtVPGc5zcnx6Ux74CjLbun+uG8Vb +MJHKKKECgYEA71QV/GfmNRSkvgvx8tykpmzlVrl65YTd/m/tVlZWZOEW/IpzfPEd +/VESdDy6v9NqkEcZBjmhi6BHVHhdT0ouVb/Rqm54zJ+8LV84AdCDOjn2S/ldUNTx +9lv7XWntew52QPZdT3kTC/193z+11bxKO/9eZ+ns75PUKiqARhBGSfECgYEA0VCi +cP6yiX5RelL8KY3ZZBhrOOXvmAge/Y7OXTjFdoafn5bfxnPzUh9YpMYORQko7zAA +TW+ZOM2dhV1z+k8kTe2llUMpR3Ef+PAciLHkwLft7wLK79mD5b+DHmDuGzP/LCNt +lz0lGrWHlDdMjUXxtb/3NewzhGcoolwvTSFBlWMCgYEAm9Vjj3tToUJ01q5Od3WF +3DvRxPt281XlepQEtQ/4py0NW5kHA9a4UUZlvrwAWYFexN0WhUAnWRQe/fh1wXgq +3XjOG6xdCdgEnoJ+pGfR2qr9HZEcWtKdTm2sKbIciODszPXd4i6S4V7IhAIm8yns +KE7qeL0PoxvdrSsJZRWZvvECgYArQebQQ1LSZ3CfPxct30rWDNXb5GknmkYNUL4F +Nf5ZCGlkqeGFOeFHT4MaSnQYgFQdWmY1mqKnwpaTQUT+rexqznox5rdZNF/PKpA7 +D8ieq2RYyNL3zpQbnwCR/qY2qQBLNucnIlPQuUNTtjnz2EijrxB/7FiZPFiBdVux +LPZI0QKBgA20XOG9vU9anKchF0dsLgBtrp/ePtHFE6nb6sqS8moRAA3saW3D9Xw2 +DUE52+mM2W4p1mVUjUYqEgA5Se3SEHhsZ1Q5UVs5zAldMCKQ20+UD29oz4GKWu3L +IJVsn4e4xPdG6w49+wV02KxULSbO8whTyVx3nt2OCwfCzz0d2QCW +-----END RSA PRIVATE KEY----- diff --git a/docker/sni/key/hm-stack.hmdocker.pem b/docker/sni/key/hm-stack.hmdocker.pem deleted file mode 100644 index 890785c8..00000000 --- a/docker/sni/key/hm-stack.hmdocker.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDyHs9m3bLD2ocs -fmZ9+KaqExhnmk4H2VRDRhYqGO4r6TTW98VXuRk4oyNlEqsIHh0ZtdSt1Ey+rXyB -W83nZ/MvHosvxobYXuR763iDuVdiUgSqZc339zFAqhOP5hv5KvdwLmLoYHwaRNzF -3LqSgMWcExUE5LDrPI5RInAsIdo5+qwxBRfRClgBMFyCmntKNY8tyeJ/2cfPQTpI -HPBstTiLTK5ENggNP1FS+vZj8I1/IkR8BtQreBwphxUSkzZ3j8cwqtcJkmxRcbT1 -bFl1ng2yDEJiTZ1WBujwRplLNimCN1UJ4AmIHnRAh1w/m8uzisoepcCONJRGYSdQ -e7Af2rxDAgMBAAECggEBAN7HtrLB31ES7DnmfEwA1Om89EGv24ihUkUsYgyOL+g7 -hqEeDnjvGePhSBoiGTk47DHR+0WPCKaSXvNwE3+PSFXc1tk45K6GcdoMCjG6Aku3 -iA956RD2ZF1JoQJRCwAzpsWUCPIkhUxufG2a8hkHX8yCSl7cRmXMrG6/L1OMOo4I -7NgxQ8ILY+L+FoxXsm6bRriCd10s9uJiLkdD+M6znnxGkigeJsb7zCzojMCaayJ5 -4RLrua/GKqtUrgjLQlf1aruGfdkfaOIVLRhpQu4yOqgpOdYGvNSVMJnwiG1Q2kox -ysELWL6zXA0pLERoh2K+kr2q8+oGVONIOMFMnDYzNRECgYEA/WiikgFyLBOVWe7S -uUgHlOHho0fLKrDX0JRGWKgOprsnApM9u6ZTWJw6c6aIjCED978JoC8mxnV6LQlU -PiQT7tEOLJbvt4w4ASCvdH3ovRcBtr0YPoIzPw+BFgrmns2xnQ/0ojN6Xp3u32cF -XOi2X0xMyFJwBqojTkKTiQ/7j/cCgYEA9Jif8aLNOJyJkoQ7pIlPBqa3tOz3AEqv -itxSAwkXcERlW1eC/RHPQFzvdOdezXpR36FzX2REytMjIzE9XEfeoWA6Afqfxt/g -i9M3bvngfpJy/zBGBnxUxD65Qlu0VdrxIz4u+y+JXrHMD976SHgFaQMcPya6H3JL -F9GgVSvGOxUCgYA6nFbtmjQECcuDb3+Bpy1JvCzqDRLqnthrv7+9hbFN0v+k0tV2 -b3PbjNbgJOZ0MrauOJtLV1yKjmVhwUSg0sthcyzqF0b+lwnlCOBL+0s3YPjegUH4 -QzkDHtzmckMA++ZWw3f7hBiLhc/YEAXnhVOZGxavRpHumK9tzGw/SVkP5QKBgQDf -ouCynSjINw/t/6tMsCKqMSrMaNEZ2i+QZgsyLVDZ3B9UGbpxSqRU8+QY3icm9kz/ -jG2hbVscm1mIJtA0nJ2orQO8pXsK6c0z6yXG+P7Sm3I7ctbDvU//sl3Ol2xWB33s -vEFWdstB4oxygmwScHJ55lcgQndwox6Xo5nV5dU0VQKBgB1GWrPRhZ95eWn5H9tf -03ydSCVSjJojpNaDWwsbCju4apCMlCo8eI2i0Yzp+HvehefntpKhgzJyaOoZ4Acp -xOC68dk69tHlMVFiuDP93+yGRadLj3Omc6sK5YYNL8VJ2BqUUGkFTkbHhrAFwr5D -t7nZg7QpmcpCxtNThlN4NOUU ------END PRIVATE KEY----- diff --git a/docker/ssl.cert b/docker/ssl.cert index bbf8a3cc..4f0f1a8e 100644 --- a/docker/ssl.cert +++ b/docker/ssl.cert @@ -1,19 +1,101 @@ -----BEGIN CERTIFICATE----- -MIIDBTCCAe2gAwIBAgIJAOM40BTLOQAyMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV -BAMMDiouYndwLmhtZG9ja2VyMB4XDTE4MDMyODIwNDY1MloXDTI4MDMyNTIwNDY1 -MlowGTEXMBUGA1UEAwwOKi5id3AuaG1kb2NrZXIwggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQDLgakpaSrpfn2qf0Y9dxyBf6dpfGC47B+ZofkvcSqSAiAs -lWgwxGGZDkyrhERf+A9sKVHUH9k+oT7vY/M0m1k3/wa1KaEyk/W2mc+0LUlzyDYc -Sn3tcWcezmDI+8eDu5aqiDcbhlAM5yezMBWUJBwNB7LYEdDiFfYszSt1aS9YrBks -yqHMWqXDcgmRBaAMLiIr/ItjmsLINpsJUxxbfrsdOfHOzTUXs2W3viYz3oEJQucw -rxAC1CxhemQ91N76qaK/14T84cyoNwtjUcok18Z5/30AXVc6vaChT2WH+KTjddQ0 -YCzQuWwy3a6qq6Ee3ua+paYvsvFSZR71TTyzauPJAgMBAAGjUDBOMB0GA1UdDgQW -BBR+Kq/ifpOg9UeVc38UosLqdDZOrzAfBgNVHSMEGDAWgBR+Kq/ifpOg9UeVc38U -osLqdDZOrzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQWcrSdugf -YX8I4xMAoYsFjgM9BPhmiD39Ex0W/rpMqPeZ/77zHRdX0IriY1rkuQBUtoTSudo4 -vb0BAvzUUVKyNAjwuJ9akEpSIjmDdFdnPCZXqW2i9OmMMcXv7lwf48ZG1tPE4iW1 -2vil7spoaf/JPZATPChyN2I1WIe/qrVMcMcY1ICqvbwygleVeDk5Y0cRdWlxR/XG -y0tVWZxrGAq4GCmLy1WqhX1ZYLur0D0wejJ6XbNi/TaanBNMHf6hfDLt7/HXrauP -jaowf3z3bmqrzKyqT9bxpks+Fed28hR86fLPfj8ES4ATEM81CS5hRPf9xua7aFKZ -YTx2eeGhX92C +MIIF8TCCBNmgAwIBAgIRAKnmCNsI3vnqJ1XBsFkZGw8wDQYJKoZIhvcNAQELBQAw +gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE +AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD +QTAeFw0xOTAzMDcwMDAwMDBaFw0yMDAzMDcyMzU5NTlaMFgxITAfBgNVBAsTGERv +bWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UECxMUUG9zaXRpdmVTU0wgV2ls +ZGNhcmQxFDASBgNVBAMMCyouYWx0aXMuZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAw68IFsiDGEVjKm+ZVu6RipVPBdNH9zURyhGteuZhW++/aFrz +oFnaePugtL09adRg1NJ3MmQ3xNLH129WZJpW1KCH18MG90SK4FHxEolxk4HvTlRF +iEy/WHc9OkDhq8tOeDDeKmbdrSDtfcaB67+g1ucf4VzafUYcriwk5YHn8oBexbwC +gHwNZrz5lHJXsKPqbQjMt2lNqCA9uS4Qkktgl78dUNOGxE7JI/s3kE2QfCynFJK7 +Rm52RuBohcz5IaEJ5TDNovBU5bnHMBjBb36LBmZhK6AVw7dyLp5ir/oEMKDrJZxi +2cSdi4JPM65OGlOhX0+H5dXOIa+GTxBvC2jdMwIDAQABo4ICfDCCAngwHwYDVR0j +BBgwFoAUjYxexFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFIa0dxxwyd3EXJa+ +ILpz1G5aXuH8MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIH +MCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAEC +ATCBhAYIKwYBBQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3Rp +Z28uY29tL1NlY3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0Eu +Y3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTAhBgNVHREE +GjAYggsqLmFsdGlzLmRldoIJYWx0aXMuZGV2MIIBAgYKKwYBBAHWeQIEAgSB8wSB +8ADuAHUAu9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFpVyxpwwAA +BAMARjBEAiAc4qqqXvHCY91JBoZ/jpFj9/A7URJnRVLTWmkW3KfIuQIgIVa/3yyP +tEy1+LQPee22x7SGN67XI8qNeAvZLc7rVBMAdQBep3P531bA57U2SH3QSeAyepGa +DIShEhKEGHWWgXFFWAAAAWlXLGoSAAAEAwBGMEQCIEooOeJqL2tswMe/XwKo1F2S +dvusT/pqQ5xfuPUVTgXvAiAeL60Z5d6ULlCEqNVytdBrHCLQu1M3GrbM8M98/YSr +7jANBgkqhkiG9w0BAQsFAAOCAQEAK4uk8dwUjmJNDbF6oxOfTNuuDCPq9ZSnY/5V +yw2m1jPSHIJyQTQKPHJk4mzulnBiQD48q4EHN7nJPAFk6SjvR8FYovgyQB6vKDoK +/t99zVOYwDBWGKhhgMed2SZcUFAg6xf0RHT5JRkSnSjfX3fQTCWHsGNIw2CVB+R8 +Dv+dsDM9JXqLAs4j7HersH1D0Cf9TDDK8FGRjXatGc7bE5tjlewkQZQY18Iu3Z09 +wGtz/jm6QNhR6P0Fb3TVHyRzULWquNaeQaTgHc0qB5ct4QJmpDedc09aQWymOgBE +A7GGwki+s4+yGOsL+kQedTKmR/HS3NqSVXZVWnBQ5rkVJNkgEA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx +MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBjzELMAkGA1UEBhMCR0IxGzAZBgNV +BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE +ChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5TZWN0aWdvIFJTQSBEb21haW4g +VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA1nMz1tc8INAA0hdFuNY+B6I/x0HuMjDJsGz99J/LEpgPLT+N +TQEMgg8Xf2Iu6bhIefsWg06t1zIlk7cHv7lQP6lMw0Aq6Tn/2YHKHxYyQdqAJrkj +eocgHuP/IJo8lURvh3UGkEC0MpMWCRAIIz7S3YcPb11RFGoKacVPAXJpz9OTTG0E +oKMbgn6xmrntxZ7FN3ifmgg0+1YuWMQJDgZkW7w33PGfKGioVrCSo1yfu4iYCBsk +Haswha6vsC6eep3BwEIc4gLw6uBK0u+QDrTBQBbwb4VCSmT3pDCg/r8uoydajotY +uK3DGReEY+1vVv2Dy2A0xHS+5p3b4eTlygxfFQIDAQABo4IBbjCCAWowHwYDVR0j +BBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFI2MXsRUrYrhd+mb ++ZsF4bgBjWHhMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYGBFUdIAAw +CAYGZ4EMAQIBMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0 +LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2Bggr +BgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNv +bS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDov +L29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAMr9hvQ5Iw0/H +ukdN+Jx4GQHcEx2Ab/zDcLRSmjEzmldS+zGea6TvVKqJjUAXaPgREHzSyrHxVYbH +7rM2kYb2OVG/Rr8PoLq0935JxCo2F57kaDl6r5ROVm+yezu/Coa9zcV3HAO4OLGi +H19+24rcRki2aArPsrW04jTkZ6k4Zgle0rj8nSg6F0AnwnJOKf0hPHzPE/uWLMUx +RP0T7dWbqWlod3zu4f+k+TY4CFM5ooQ0nBnzvg6s1SQ36yOoeNDT5++SR2RiOSLv +xvcRviKFxmZEJCaOEDKNyJOuB56DPi/Z+fVGjmO+wea03KbNIaiGCpXZLoUmGv38 +sbZXQm2V0TP2ORQGgkE49Y9Y3IBbpNV9lXj9p5v//cWoaasm56ekBYdbqbe4oyAL +l6lFhd2zi+WJN44pDfwGF/Y4QA5C5BIG+3vzxhFoYt/jmPQT2BVPi7Fp2RBgvGQq +6jG35LWjOhSbJuMLe/0CjraZwTiXWTb2qHSihrZe68Zk6s+go/lunrotEbaGmAhY +LcmsJWTyXnW0OMGuf1pGg+pRyrbxmRE1a6Vqe8YAsOf4vmSyrcjC8azjUeqkk+B5 +yOGBQMkKW+ESPMFgKuOXwIlCypTPRpgSabuY0MLTDXJLR27lk8QyKGOHQ+SwMj4K +00u/I5sUKUErmgQfky3xxzlIPK1aEn8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk +ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF +eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow +gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK +ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD +VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sIs9CsVw127c0n00yt +UINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnGvDoZtF+mvX2do2NC +tnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQIjy8/hPwhxR79uQf +jtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfbIWax1Jt4A8BQOujM +8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0tyA9yn8iNK5+O2hm +AUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97Exwzf4TKuzJM7UXiV +Z4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNVicQNwZNUMBkTrNN9 +N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5D9kCnusSTJV882sF +qV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJWBp/kjbmUZIO8yZ9 +HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ5lhCLkMaTLTwJUdZ ++gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzGKAgEJTm4Diup8kyX +HAc/DVL17e8vgg8CAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTv +A73gJMtUGjAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/ +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1Ud +HwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4 +dGVybmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0 +dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAJNl9jeD +lQ9ew4IcH9Z35zyKwKoJ8OkLJvHgwmp1ocd5yblSYMgpEg7wrQPWCcR23+WmgZWn +RtqCV6mVksW2jwMibDN3wXsyF24HzloUQToFJBv2FAY7qCUkDrvMKnXduXBBP3zQ +YzYhBx9G/2CkkeFnvN4ffhkUyWNnkepnB2u0j4vAbkN9w6GAbLIevFOFfdyQoaS8 +Le9Gclc1Bb+7RrtubTeZtv8jkpHGbkD4jylW6l/VXxRTrPBPYer3IsynVgviuDQf +Jtl7GQVoP7o81DgGotPmjw7jtHFtQELFhLRAlSv0ZaBIefYdgWOWnU914Ph85I6p +0fKtirOMxyHNwu8= -----END CERTIFICATE----- diff --git a/docker/ssl.key b/docker/ssl.key index 68ae403d..deef4842 100644 --- a/docker/ssl.key +++ b/docker/ssl.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/inc/Composer/Command.php b/inc/Composer/Command.php index 901315fe..edd85b42 100644 --- a/inc/Composer/Command.php +++ b/inc/Composer/Command.php @@ -14,9 +14,6 @@ protected function configure() { protected function execute( InputInterface $input, OutputInterface $output ) { $output->writeln( 'Starting...' ); - if ( ! file_exists( '/etc/resolver/hmdocker' ) ) { - `sh vendor/humanmade/local-server/docker/bin/install.sh`; - } $proxy = new Process( 'docker-compose -f proxy.yml up', 'vendor/humanmade/local-server/docker' ); $proxy->setTimeout( 0 ); @@ -33,7 +30,5 @@ protected function execute( InputInterface $input, OutputInterface $output ) { } ); $compose->wait(); - - //`NAME=$(basename "\$PWD") ; cd vendor/humanmade/local-server/docker && docker-compose -f proxy.yml up -d && VOLUME=../../../../ COMPOSE_PROJECT_NAME=\$NAME docker-compose up && echo "Started." && open "http://\$NAME.hmdocker"`; } } diff --git a/wp-config.php b/wp-config.php index ff8b95fb..9e18da68 100644 --- a/wp-config.php +++ b/wp-config.php @@ -1,7 +1,7 @@ getenv( 'REDIS_HOST' ),