diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2019-06-21 12:06:12 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-21 12:06:12 +0000 |
| commit | 6119d5ad7518f547af216d3bdc3d1fcffcfc9c71 (patch) | |
| tree | cc1a1e74efb5e44bd5c5d152da85b7fed4ff2107 /db | |
| parent | 176164d37423ffb39d293341799aff757f050d7c (diff) | |
| download | gitlab-ce-6119d5ad7518f547af216d3bdc3d1fcffcfc9c71.tar.gz | |
Don't show private keys for letsencrypt certs
Adds enum certificate_source to pages_domains table
with default manually_uploaded
Mark certificates as 'gitlab_provided'
if the were obtained through Let's Encrypt
Mark certificates as 'user_provided' if they were uploaded through
controller or api
Only show private key in domain edit form if it is 'user_provided'
Only show LetsEncrypt option if is enabled by application settings
(and feature flag)
Refactor and fix some specs to match new logic
Don't show Let's Encrypt certificates as well
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20190607085356_add_source_to_pages_domains.rb | 21 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/db/migrate/20190607085356_add_source_to_pages_domains.rb b/db/migrate/20190607085356_add_source_to_pages_domains.rb new file mode 100644 index 00000000000..0a845d7d11f --- /dev/null +++ b/db/migrate/20190607085356_add_source_to_pages_domains.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddSourceToPagesDomains < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:pages_domains, :certificate_source, :smallint, default: 0) + end + + def down + remove_column(:pages_domains, :certificate_source) + end +end diff --git a/db/schema.rb b/db/schema.rb index 02d8ab10935..c1c67e012e9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2333,6 +2333,7 @@ ActiveRecord::Schema.define(version: 20190619175843) do t.boolean "auto_ssl_enabled", default: false, null: false t.datetime_with_timezone "certificate_valid_not_before" t.datetime_with_timezone "certificate_valid_not_after" + t.integer "certificate_source", limit: 2, default: 0, null: false t.index ["domain"], name: "index_pages_domains_on_domain", unique: true, using: :btree t.index ["project_id", "enabled_until"], name: "index_pages_domains_on_project_id_and_enabled_until", using: :btree t.index ["project_id"], name: "index_pages_domains_on_project_id", using: :btree |