From aa59d92c44f8c3b6eaeddcefe555ddea7373d356 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 18 Apr 2019 13:45:39 +0200
Subject: Rename gitlab-ci-multi-runner to gitlab-runner

---
 manifests/init.pp                           |  2 +-
 manifests/install.pp                        |  2 +-
 manifests/params.pp                         | 10 +++++-----
 manifests/repo.pp                           |  8 ++++----
 spec/classes/gitlab_ci_multi_runner_spec.rb |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index cd39308..828c9f1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,7 @@
 #
 # [*package_name*]
 #   Specify gitlab multi runner package name
-#   Defaults to gitlab-ci-multi-runner
+#   Defaults to gitlab-runner
 #
 # [*service_name*]
 #   Specify the service name for gitlab multi runner
diff --git a/manifests/install.pp b/manifests/install.pp
index 3fb8a0a..12b7de3 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -8,6 +8,6 @@ class gitlab_ci_multi_runner::install {
 
   package { $gitlab_ci_multi_runner::package_name:
     ensure => present,
-    tag    => 'gitlab-ci-multi-runner',
+    tag    => 'gitlab-runner',
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 5a18d34..2525183 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,14 +13,14 @@ class gitlab_ci_multi_runner::params {
   $runners             = {}
 
   $service_ensure      = true
-  $service_start       = '/usr/bin/gitlab-ci-multi-runner start'
-  $service_stop        = '/usr/bin/gitlab-ci-multi-runner stop'
-  $service_status      = '/usr/bin/gitlab-ci-multi-runner status'
-  $service_restart     = '/usr/bin/gitlab-ci-multi-runner restart'
+  $service_start       = '/usr/bin/gitlab-runner start'
+  $service_stop        = '/usr/bin/gitlab-runner stop'
+  $service_status      = '/usr/bin/gitlab-runner status'
+  $service_restart     = '/usr/bin/gitlab-runner restart'
 
   case $::osfamily {
     'Debian': {
-      $package_name        = 'gitlab-ci-multi-runner'
+      $package_name        = 'gitlab-runner'
       $service_name        = 'gitlab-runner'
       $manage_package_repo = true
       $service_enable      = false
diff --git a/manifests/repo.pp b/manifests/repo.pp
index 55e73df..35a1f23 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -11,12 +11,12 @@ class gitlab_ci_multi_runner::repo {
       ensure_packages('apt-transport-https')
 
       Package['apt-transport-https'] ->
-        Apt::Source['gitlab-ci-multi-runner'] ->
-        Package['gitlab-ci-multi-runner']
+        Apt::Source['gitlab-runner'] ->
+        Package['gitlab-runner']
 
-      apt::source { 'gitlab-ci-multi-runner':
+      apt::source { 'gitlab-runner':
         comment  => 'This is an officiel apt repo for Gitlab Ci Multi Runner',
-        location => 'https://packages.gitlab.com/runner/gitlab-ci-multi-runner/debian/',
+        location => 'https://packages.gitlab.com/runner/gitlab-runner/debian/',
         release  => $::lsbdistcodename,
         repos    => 'main',
         key      => {
diff --git a/spec/classes/gitlab_ci_multi_runner_spec.rb b/spec/classes/gitlab_ci_multi_runner_spec.rb
index 2092e9f..b9261c0 100644
--- a/spec/classes/gitlab_ci_multi_runner_spec.rb
+++ b/spec/classes/gitlab_ci_multi_runner_spec.rb
@@ -25,17 +25,17 @@ describe 'gitlab_ci_multi_runner', :type => :class do
           it { should contain_class('gitlab_ci_multi_runner::service').that_subscribes_to('gitlab_ci_multi_runner::config') }
 
           it { should contain_class('apt') }
-          it { should contain_package('apt-transport-https').that_comes_before('Apt::Source[gitlab-ci-multi-runner]').that_comes_before('Package[gitlab-ci-multi-runner]') }
-          it { should contain_apt__source('gitlab-ci-multi-runner').with_location('https://packages.gitlab.com/runner/gitlab-ci-multi-runner/debian/') }
+          it { should contain_package('apt-transport-https').that_comes_before('Apt::Source[gitlab-runner]').that_comes_before('Package[gitlab-runner]') }
+          it { should contain_apt__source('gitlab-runner').with_location('https://packages.gitlab.com/runner/gitlab-runner/debian/') }
 
           it { should contain_service('gitlab-runner') }
-          it { should contain_package('gitlab-ci-multi-runner').with_name('gitlab-ci-multi-runner').with_ensure('present') }
+          it { should contain_package('gitlab-runner').with_name('gitlab-runner').with_ensure('present') }
 
           it { should contain_package('apt-transport-https').with_ensure('present') }
 
           context 'with service_enable set to false' do
             let(:params) { {'service_enable' => false} }
-            it { should_not contain_service('gitlab-ci-multi-runner') }
+            it { should_not contain_service('gitlab-runner') }
           end
 
         end
-- 
cgit v1.2.3