Skip to content

Commit

Permalink
Change apt_repository property, because it conflicts with apt resource
Browse files Browse the repository at this point in the history
  • Loading branch information
sinfomicien committed Apr 2, 2019
1 parent 67f47d7 commit 10594a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions resources/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
property :apt_gpg_keyserver, String, default: 'keyserver.ubuntu.com'
property :apt_gpg_key, String, default: 'F1656F24C74CD1D8'
property :apt_key_proxy, [String, false], default: false
property :apt_repository, String, default: 'http://mariadb.mirrors.ovh.net/MariaDB/repo'
property :apt_repository_uri, String, default: 'http://mariadb.mirrors.ovh.net/MariaDB/repo'

action :add do
case node['platform_family']
Expand All @@ -47,7 +47,7 @@
apt_key = new_resource.apt_gpg_key == 'F1656F24C74CD1D8' && node['platform'] == 'debian' && node['platform_version'].split('.')[0].to_i < 9 ? 'CBCB082A1BB943DB' : new_resource.apt_gpg_key

apt_repository 'mariadb_org_repository' do
uri "#{new_resource.apt_repository}/#{new_resource.version}/#{node['platform']}"
uri "#{new_resource.apt_repository_uri}/#{new_resource.version}/#{node['platform']}"
components ['main']
distribution node['lsb']['codename']
keyserver new_resource.apt_gpg_keyserver
Expand Down

0 comments on commit 10594a8

Please sign in to comment.