vagrant-sakura 0.2.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d2e7d9a658717576fbeea2ae64172521419c3b66e5e0235c6f175d76406376
-  data.tar.gz: fa60c01b3fec7e7287954b1f8bddeeadd6ae3c2150292d9dae879f34de929028
+  metadata.gz: 2ac5bd309695b4f433c107878c79409d19957714751fd10f446b3e0643533831
+  data.tar.gz: 547cf4d2531ce4b7b6b59835f7f09721b550710f104d69d662cb1b4879e831f9
 SHA512:
-  metadata.gz: c54c6ad3a43e1b77fd5dbcaf3af8070c33a2aa01ee5bddd1fd0ae475b72bf654543848500740d201c15d69e5b411895e32c07b1cf3d044e15f884935e8247ad4
-  data.tar.gz: aa62290db7c612547abbad5f7e0d25bc7316f5bce6dc80edd65d00c1768dedfce1df480c6e5af1581d442d7ec768849ac0ae11bcf21e6d9ba01b3d5f1615e021
+  metadata.gz: d164e746811fa345335e3eac6d74e60dd89d62f20674782399159579c14d4da7213891d046e30a198aa072321e2493f8f7fe5a7d1d6d442e26c733d3b54ebbc6
+  data.tar.gz: f0b7c9df6f5a7ddb7ef8aa1d08e8d245aeb467236f2c6f54a057c29618e3a7d596df0a98b62289d3efe92eeead10bd21b8d5ae66c4e8efa9af543059e027261e

data/.github/workflows/tests.yaml

@@ -0,0 +1,18 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        ruby: [2.5, 2.6, 2.7]
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## 0.4.2 (2020/10/09)
+
+- Github Actions [#52] (@yamamoto-febc)
+- Use vagrant 2.2.10 [#51] (@yamamoto-febc)
+- Remove ruby-2.3.7 from test targets on TravisCI [#49] (@yamamoto-febc)
+
+## 0.4.1 (2020/10/08)
+
+- Ubuntu 20.04 (#48)
+
+## 0.4.0 (2019/11/21)
+
+- os_typeの追加 (#43)
+
+## 0.3.2 (2018/12/18)
+
+- 埋め込みのcert.pemを除去 (#42)
+
+## 0.3.1 (2018/12/18)
+
+- os_type バリデーション修正 (#41)
+
+## 0.3.0 (2018/11/5)
+
+- Use new disk-edit API (#40)
+
 ## 0.2.1 (2018/09/27)
 
 - Re-released due to maintainer's error.  This release as the same commit as v0.2.0.

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v2.1.2'
+  gem "vagrant", :git => "git://github.com/hashicorp/vagrant.git", :tag => 'v2.2.10'
   gem "test-unit", "~> 3.2.3"
   # gem "test-unit-rr", "~> 1.0.5"
-  gem "rake", "~> 12.0.0"
+  gem "rake", ">= 12.3.3"
 end
 
 group :plugins do

data/README.md

@@ -184,18 +184,26 @@ $ vagrant sakura-list-id
 |指定可能な値|SSHユーザー名|Vagrantfileの例|備考|
 |---|---|:---:|---|
 |`ubuntu`(デフォルト)|`ubuntu`| [example](examples/ubuntu.md) | - |
+|`ubuntu-20.04`|`ubuntu`| - | - |
 |`ubuntu-18.04`|`ubuntu`| - | - |
 |`ubuntu-16.04`|`ubuntu`| - | - |
 |`centos`|`root`| [example](examples/centos.md) | - |
+|`centos8`|`root`| [example](examples/centos8.md) | - |
+|`centos7`|`root`| [example](examples/centos7.md) | - |
 |`centos6`|`root`| [example](examples/centos6.md) | - |
 |`debian`|`root`| [example](examples/debian.md) | - |
+|`debian10`|`root`| - | - |
+|`debian9`|`root`| - | - |
 |`coreos`|`core`| [example](examples/coreos.md) | - |
 |`freebsd`|`root`| [example](examples/freebsd.md) | - |
 |`rancheros`|`rancher`| [example](examples/rancheros.md) | メモリ2GB以上のプランが必要 |
+|`k3os`|`rancher`| [example](examples/k3os.md) | - |
 
 - ``disk_source_archive`` - サーバで利用するディスクのベースとするアーカイブのID (※`os_type`とは同時に指定できません)
 - ``server_name`` - サーバ名
-- ``server_plan`` - 作成するサーバのプラン ID
+- ``server_plan`` - 作成するサーバのプラン ID(**非推奨** 代わりに`server_core`と`server_memory`を利用してください)
+- ``server_core`` - 作成するサーバのコア数(デフォルト: `1`)
+- ``server_memory`` - 作成するサーバのメモリサイズ(GB単位、デフォルト: `1`)
 - ``packet_filter`` - 作成するサーバに適用するパケットフィルタ ID
 - ``startup_scripts`` - 作成するサーバに適用するスタートアップスクリプト ID(リスト)
 - ``enable_pw_auth`` - パスワード認証の有効化(デフォルト: `false`)
@@ -216,17 +224,18 @@ $ vagrant sakura-list-id
 ```sh
 $ bundle
 ```
-依存パッケージが入ったら、。。。
-開発を始められます。
-``Vagrantfile`` を clone したディレクトリに置いて
-(.gitignore に書いてあるので git には無視されます)、
-以下の行を ``Vagrantfile`` に足してやれば、プラグインをインストールしなくても
-開発中の Vagrant 環境をテストすることができます。
-```Ruby
-Vagrant.require_plugin "vagrant-sakura"
+
+開発中のプラグインをテストするには以下のようにビルドしてから`vagrant plugin`コマンドでプラグインをインストールします。
+
+```sh
+bundle exec rake build
+vagrant plugin install pkg/vagrant-sakura-*.gem
 ```
 
-Vagrant を実行する時は bundler を使ってください:
+プラグインをインストール後、``Vagrantfile`` を clone したディレクトリに置いて
+(.gitignore に書いてあるので git には無視されます)、
+
+開発中の Vagrant 環境をテストすることができます。
 ```sh
-$ bundle exec vagrant up --provider=sakura
+$ vagrant up 
 ```

data/examples/centos.md

@@ -1,4 +1,4 @@
-# Vagrantfileの例(CentOS7を利用する場合)
+# Vagrantfileの例(CentOS最新安定板を利用する場合)
 
 ```bash
 Vagrant.configure("2") do |config|

data/examples/centos7.md

@@ -0,0 +1,15 @@
+# Vagrantfileの例(CentOS7を利用する場合)
+
+```bash
+Vagrant.configure("2") do |config|
+  config.vm.box = "dummy"
+  config.ssh.username = "root"
+
+  config.vm.provider :sakura do |sakura, override|
+    sakura.os_type = "centos7"
+    
+    sakura.public_key_path        = File.expand_path("~/.ssh/id_rsa.pub")
+    override.ssh.private_key_path = File.expand_path("~/.ssh/id_rsa")
+  end
+end
+```

data/examples/centos8.md

@@ -0,0 +1,15 @@
+# Vagrantfileの例(CentOS8を利用する場合)
+
+```bash
+Vagrant.configure("2") do |config|
+  config.vm.box = "dummy"
+  config.ssh.username = "root"
+
+  config.vm.provider :sakura do |sakura, override|
+    sakura.os_type = "centos8"
+    
+    sakura.public_key_path        = File.expand_path("~/.ssh/id_rsa.pub")
+    override.ssh.private_key_path = File.expand_path("~/.ssh/id_rsa")
+  end
+end
+```

data/examples/k3os.md

@@ -0,0 +1,16 @@
+# Vagrantfileの例(k3OSを利用する場合)
+
+```bash
+Vagrant.configure("2") do |config|
+  config.vm.box = "dummy"
+  config.ssh.username = "rancher"
+  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
+
+  config.vm.provider :sakura do |sakura, override|
+    sakura.os_type = "k3os"
+    
+    sakura.public_key_path        = File.expand_path("~/.ssh/id_rsa.pub")
+    override.ssh.private_key_path = File.expand_path("~/.ssh/id_rsa")
+  end
+end
+```

data/examples/rancheros.md

@@ -8,7 +8,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.provider :sakura do |sakura, override|
     sakura.os_type = "rancheros"
-    sakura.server_plan = 4002 # 2core/4GBメモリ プラン
+    
+    # 2core/4GBメモリ プラン
+    sakura.server_core = 2 
+    sakura.server_memory = 4 
     
     sakura.public_key_path        = File.expand_path("~/.ssh/id_rsa.pub")
     override.ssh.private_key_path = File.expand_path("~/.ssh/id_rsa")

data/lib/vagrant-sakura/action/run_instance.rb

@@ -19,8 +19,9 @@ module VagrantPlugins
           server_name = env[:machine].provider_config.server_name
           server_name ||= env[:machine].name
           server_plan = env[:machine].provider_config.server_plan
+          server_core = env[:machine].provider_config.server_core
+          server_memory = env[:machine].provider_config.server_memory
           disk_plan = env[:machine].provider_config.disk_plan
-          disk_source_mode = env[:machine].provider_config.disk_source_mode
           os_type = env[:machine].provider_config.os_type
           disk_source_archive = env[:machine].provider_config.disk_source_archive
           sshkey_id = env[:machine].provider_config.sshkey_id
@@ -34,7 +35,12 @@ module VagrantPlugins
 
           env[:ui].info(I18n.t("vagrant_sakura.creating_instance"))
           env[:ui].info(" -- Server Name: #{server_name}")
-          env[:ui].info(" -- Server Plan: #{server_plan}")
+          if server_plan
+            env[:ui].info(" -- Server Plan: #{server_plan}")
+          else
+            env[:ui].info(" -- Server Core: #{server_core}")
+            env[:ui].info(" -- Server Memory: #{server_memory}")
+          end
           env[:ui].info(" -- Disk Plan: #{disk_plan}")
           env[:ui].info(" -- Disk Source OS Type: #{os_type}") if os_type
           env[:ui].info(" -- Disk Source Archive: #{disk_source_archive}")
@@ -45,8 +51,55 @@ module VagrantPlugins
 
           api = env[:sakura_api]
 
+          data = {
+              "Server" => {
+                  "Name" => server_name,
+                  "ServerPlan" => { "ID" => server_plan },
+                  "ConnectedSwitches" => [
+                      { "Scope" => "shared", "BandWidthMbps" => 100 }
+                  ],
+                  "Tags" => tags,
+                  "Description" => description
+              }
+          }
+          if server_plan
+            data["Server"]["ServerPlan"] = { "ID" => server_plan }
+          else
+            data["Server"]["ServerPlan"] = {
+                "CPU" => server_core,
+                "MemoryMB" => server_memory * 1024
+            }
+          end
+          unless env[:machine].provider_config.disk_id
+            data["Server"]["WaitDiskMigration"] = true
+          end
+
+          response = api.post("/server", data)
+          unless response["Server"]["ID"]
+            raise 'no Server ID returned'
+          end
+          env[:machine].id = serverid = response["Server"]["ID"]
+          interface_id = response["Server"]["Interfaces"][0]["ID"]
+          # Server Created
+
+          unless packet_filter.empty?
+            response = api.put("/interface/#{interface_id}/to/packetfilter/#{packet_filter}")
+            # Packet Filter connected to Server
+          end
+
           if env[:machine].provider_config.disk_id
             diskid = env[:machine].provider_config.disk_id
+
+            begin
+              response = api.put("/disk/#{diskid}/to/server/#{serverid}")
+                # Disk mounted to Server
+            rescue VagrantPlugins::Sakura::Driver::NotFoundError
+              terminate(env)
+              raise
+            end
+
+            # Power On
+            response = api.put("/server/#{serverid}/power")
           else
             data = {
               "Disk" => {
@@ -56,10 +109,32 @@ module VagrantPlugins
                 "SourceArchive" => {
                   "ID" => disk_source_archive
                 },
+                "Server" => {
+                    "ID" => serverid
+                },
                 "Tags" => tags,
                 "Description" => description
-              }
+              },
+              "BootAtAvailable" => true
             }
+
+            config = {
+                "UserSubnet" => {},
+                "Notes" => startup_scripts,
+                "DisablePWAuth" => !enable_pw_auth
+            }
+            if sshkey_id
+              config["SSHKey"] = { "ID" => sshkey_id }
+            elsif public_key_path
+              config["SSHKey"] = { "PublicKey" => File.read(public_key_path) }
+            elsif use_insecure_key
+              pubkey = Vagrant.source_root.join("keys", "vagrant.pub").read.chomp
+              config["SSHKey"] = { "PublicKey" => pubkey }
+            else
+              raise 'failsafe'
+            end
+            data["Config"] = config
+
             response = api.post("/disk", data)
             unless response["Disk"]["ID"]
               raise 'no Disk ID returned'
@@ -83,59 +158,6 @@ module VagrantPlugins
             end
           end
 
-          data = {
-            "Server" => {
-              "Name" => server_name,
-              "ServerPlan" => { "ID" => server_plan },
-              "ConnectedSwitches" => [
-                { "Scope" => "shared", "BandWidthMbps" => 100 }
-              ],
-              "Tags" => tags,
-              "Description" => description
-            }
-          }
-          response = api.post("/server", data)
-          unless response["Server"]["ID"]
-            raise 'no Server ID returned'
-          end
-          env[:machine].id = serverid = response["Server"]["ID"]
-          interface_id = response["Server"]["Interfaces"][0]["ID"]
-          # Server Created
-
-          unless packet_filter.empty?
-            response = api.put("/interface/#{interface_id}/to/packetfilter/#{packet_filter}")
-            # Packet Filter connected to Server
-          end
-
-          begin
-            response = api.put("/disk/#{diskid}/to/server/#{serverid}")
-            # Disk mounted to Server
-          rescue VagrantPlugins::Sakura::Driver::NotFoundError
-            terminate(env)
-            raise
-          end
-
-          data = {
-            "UserSubnet" => {},
-            "Notes" => startup_scripts,
-            "DisablePWAuth" => !enable_pw_auth
-          }
-          if sshkey_id
-            data["SSHKey"] = { "ID" => sshkey_id }
-          elsif public_key_path
-            data["SSHKey"] = { "PublicKey" => File.read(public_key_path) }
-          elsif use_insecure_key
-            pubkey = Vagrant.source_root.join("keys", "vagrant.pub").read.chomp
-            data["SSHKey"] = { "PublicKey" => pubkey }
-          else
-            raise 'failsafe'
-          end
-
-          response = api.put("/disk/#{diskid}/config", data)
-          # Config
-
-          response = api.put("/server/#{serverid}/power")
-          # Power On
 
           if !env[:interrupted]
             # Wait for SSH to be ready.

data/lib/vagrant-sakura/config.rb

@@ -47,10 +47,23 @@ module VagrantPlugins
       attr_accessor :server_name
 
       # The Plan ID of the server.
-      # 
+      #
+      # @deprecated Use {#server_core} and {#server_memory} instead.
       # @return [Fixnum]
       attr_accessor :server_plan
 
+      # The number of cores.
+      #
+      # @return [Fixnum]
+      attr_accessor :server_core
+
+      # The number of memories.
+      # unit: GB
+      #
+      # @deprecated Use {#server_core} and {#server_memory} instead.
+      # @return [Fixnum]
+      attr_accessor :server_memory
+
       # The resource ID of the SSH public key to login the server.
       # 
       # @return [String]
@@ -104,6 +117,8 @@ module VagrantPlugins
         @public_key_path     = UNSET_VALUE
         @server_name         = UNSET_VALUE
         @server_plan         = UNSET_VALUE
+        @server_core         = UNSET_VALUE
+        @server_memory       = UNSET_VALUE
         @sshkey_id           = UNSET_VALUE
         @use_insecure_key    = UNSET_VALUE
         @enable_pw_auth      = UNSET_VALUE
@@ -167,7 +182,13 @@ module VagrantPlugins
         end
 
         if @server_plan == UNSET_VALUE
-          @server_plan = 1001  # 1Core-1GB - cheapest
+          @server_plan = nil
+        end
+        if @server_core == UNSET_VALUE
+          @server_core = 1
+        end
+        if @server_memory == UNSET_VALUE
+          @server_memory = 1
         end
 
         @sshkey_id = nil if @sshkey_id == UNSET_VALUE
@@ -213,8 +234,10 @@ module VagrantPlugins
           errors << I18n.t("vagrant_sakura.config.need_ssh_key_config")
         end
 
-        if not VagrantPlugins::Sakura::OSType::os_types.include? @os_type
-          errors << I18n.t("vagrant_sakura.config.need_valid_os_type")
+        if disk_source_mode == :os_type
+          if not VagrantPlugins::Sakura::OSType::os_types.include? @os_type
+            errors << I18n.t("vagrant_sakura.config.need_valid_os_type")
+          end
         end
 
         { "Sakura Provider" => errors }

data/lib/vagrant-sakura/driver/api.rb

@@ -6,7 +6,6 @@ module VagrantPlugins
   module Sakura
     module Driver
       APIHOST   = "secure.sakura.ad.jp"
-      CERTFILE = File.expand_path("../cert.pem", __FILE__)
 
       class API
         def initialize(access_token, access_token_secret, zone_id)
@@ -18,7 +17,6 @@ module VagrantPlugins
 
           @https = Net::HTTP.new(APIHOST, 443)
           @https.use_ssl = true
-          @https.ca_file = CERTFILE
           @https.verify_mode = OpenSSL::SSL::VERIFY_PEER
           @https.verify_depth = 3
         end

data/lib/vagrant-sakura/os_type.rb

@@ -5,27 +5,45 @@ module VagrantPlugins
           "centos" => {
               "Tags.Name" => [%w(current-stable distro-centos)]
           },
+          "centos8" => {
+              "Tags.Name" => [%w(centos-8-latest)]
+          },
+          "centos7" => {
+              "Tags.Name" => [%w(centos-7-latest)]
+          },
           "centos6" => {
-              "Tags.Name" => [%w(distro-centos distro-ver-6.10)]
+              "Tags.Name" => [%w(centos-6-latest)]
           },
           "ubuntu" => {
               "Tags.Name" => [%w(current-stable distro-ubuntu)]
           },
-          "ubuntu-16.04" => {
-              "Tags.Name" => [%w(distro-ubuntu distro-ver-16.04.4)]
+          "ubuntu-20.04" => {
+              "Tags.Name" => [%w(ubuntu-20.04-latest)]
           },
           "ubuntu-18.04" => {
-              "Tags.Name" => [%w(distro-ubuntu distro-ver-18.04)]
+              "Tags.Name" => [%w(ubuntu-18.04-latest)]
+          },
+          "ubuntu-16.04" => {
+              "Tags.Name" => [%w(ubuntu-16.04-latest)]
           },
           "debian" => {
               "Tags.Name" => [%w(current-stable distro-debian)]
           },
+          "debian10" => {
+              "Tags.Name" => [%w(debian-10-latest)]
+          },
+          "debian9" => {
+              "Tags.Name" => [%w(debian-9-latest)]
+          },
           "coreos" => {
               "Tags.Name" => [%w(current-stable distro-coreos)]
           },
           "rancheros" => {
               "Tags.Name" => [%w(current-stable distro-rancheros)]
           },
+          "k3os" => {
+              "Tags.Name" => [%w(current-stable distro-k3os)]
+          },
           "freebsd" => {
               "Tags.Name" => [%w(current-stable distro-freebsd)]
           },

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.2.1"
+    VERSION = "0.4.2"
   end
 end

data/test/test_config.rb

@@ -251,6 +251,22 @@ module VagrantPlugins
                 },
                 "expect" => false
             },
+
+            "os_type is empty with archive_id" => {
+                "config" => {
+                    "use_insecure_key" => true,
+                    "disk_source_archive" => "999999999999"
+                },
+                "expect" => true
+            },
+
+            "os_type is empty with disk_id" => {
+                "config" => {
+                    "use_insecure_key" => true,
+                    "disk_id" => "999999999999"
+                },
+                "expect" => true
+            },
         }
 
         cases.map do |name, c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sakura
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tomoyuki Sahara
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines in Sakura Cloud.
 email:
@@ -18,8 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yaml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE-vagrant-aws.txt
@@ -31,9 +31,12 @@ files:
 - example_box/metadata.json
 - examples/centos.md
 - examples/centos6.md
+- examples/centos7.md
+- examples/centos8.md
 - examples/coreos.md
 - examples/debian.md
 - examples/freebsd.md
+- examples/k3os.md
 - examples/rancheros.md
 - examples/ubuntu.md
 - lib/vagrant-sakura.rb
@@ -59,7 +62,6 @@ files:
 - lib/vagrant-sakura/command_reinstall.rb
 - lib/vagrant-sakura/config.rb
 - lib/vagrant-sakura/driver/api.rb
-- lib/vagrant-sakura/driver/cert.pem
 - lib/vagrant-sakura/errors.rb
 - lib/vagrant-sakura/os_type.rb
 - lib/vagrant-sakura/plugin.rb
@@ -88,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in Sakura Cloud.

data/.travis.yml

@@ -1,30 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-
-addons:
-  apt:
-    packages:
-    - bsdtar
-rvm:
-- 2.3.7
-- 2.4.4
-- 2.5.0
-- 2.5.1
-
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-script: bundle exec rake test
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: dPtjpKnaDadiUGiO/ZZG+CK0GRChirb6qbr5UawJff3X1POtU/Q7AXOfwYkMEZv55NT098jvtqPDcAA7ilqQu6Pb1YO51FnHqXk5UPqksCMcAucQX6ByL3V1X8Vliw2rbvKw8BTg9IoNotu6bDIFMDdU0Gz0iU35U9efkxIX+Rc=
-  on:
-    tags: true
-
-notifications:
-  slack:
-    secure: d9jmDMPRbEHfKTmY+FqYNovtDTag+NNBVE2W3YYkGLp4QCGiaHSlV6rCDDmX02fUOtLgA1FrsJJpS17/3sBG6JX3aWh4wIWW8XCzrzUmItWa25J/Fj3KutbJN0pYXeEVDR8Cw0OoAZpzlgBOBbe5mcCpPhHhe3gTUaRBxqCiQII=

data/lib/vagrant-sakura/driver/cert.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----