diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
| commit | c859c3bfd242288065fe5e2d887f7204f09e2335 (patch) | |
| tree | 10febaf8774a3ea6ab3773c0dd97658d673fb280 /app/services/pages_domains | |
| parent | 28ce39a3e0e7b47e53939a15fb823af9c433327a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/pages_domains')
| -rw-r--r-- | app/services/pages_domains/create_acme_order_service.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/services/pages_domains/create_acme_order_service.rb b/app/services/pages_domains/create_acme_order_service.rb index 8eab5c52432..c600f497fa5 100644 --- a/app/services/pages_domains/create_acme_order_service.rb +++ b/app/services/pages_domains/create_acme_order_service.rb @@ -3,9 +3,6 @@ module PagesDomains class CreateAcmeOrderService attr_reader :pages_domain - # TODO: remove this hack after https://gitlab.com/gitlab-org/gitlab/issues/30146 is implemented - # This makes GitLab automatically retry the certificate obtaining process every 2 hours if process wasn't finished - SHORT_EXPIRATION_DELAY = 2.hours def initialize(pages_domain) @pages_domain = pages_domain @@ -20,7 +17,7 @@ module PagesDomains private_key = OpenSSL::PKey::RSA.new(4096) saved_order = pages_domain.acme_orders.create!( url: order.url, - expires_at: [order.expires, SHORT_EXPIRATION_DELAY.from_now].min, + expires_at: order.expires, private_key: private_key.to_pem, challenge_token: challenge.token, |