diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-02-20 17:51:55 -0600 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-08-23 23:44:53 -0500 |
| commit | ad05e488636ebe05b4985dbf3c7d912fd8d56f49 (patch) | |
| tree | 427b631b34fa8ed7511f3ed789185cd82a1a6da9 /db | |
| parent | 892e4c0da818006159cc26bc79f1fa48b76c9b3f (diff) | |
| download | gitlab-ce-ad05e488636ebe05b4985dbf3c7d912fd8d56f49.tar.gz | |
Add support for using a Camo proxy server
User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20190219201635_add_asset_proxy_settings.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/db/migrate/20190219201635_add_asset_proxy_settings.rb b/db/migrate/20190219201635_add_asset_proxy_settings.rb new file mode 100644 index 00000000000..beeb6400292 --- /dev/null +++ b/db/migrate/20190219201635_add_asset_proxy_settings.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class AddAssetProxySettings < ActiveRecord::Migration[5.0] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + add_column :application_settings, :asset_proxy_enabled, :boolean, default: false, null: false + add_column :application_settings, :asset_proxy_url, :string + add_column :application_settings, :asset_proxy_whitelist, :text + add_column :application_settings, :encrypted_asset_proxy_secret_key, :text + add_column :application_settings, :encrypted_asset_proxy_secret_key_iv, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 944d23e5365..7e5e96707dc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -278,6 +278,11 @@ ActiveRecord::Schema.define(version: 2019_08_15_093949) do t.boolean "allow_local_requests_from_system_hooks", default: true, null: false t.bigint "instance_administration_project_id" t.string "snowplow_collector_hostname" + t.boolean "asset_proxy_enabled", default: false, null: false + t.string "asset_proxy_url" + t.text "asset_proxy_whitelist" + t.text "encrypted_asset_proxy_secret_key" + t.string "encrypted_asset_proxy_secret_key_iv" t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id" t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id" |