From bc5eda74879548402d85c6dfa877fd0cd23a713b Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Sat, 29 Jan 2022 23:53:32 +0000 Subject: [PATCH] Rename roles according to ansible recommendations --- {epel-repo => epel_repo}/tasks/main.yml | 0 .../files/google-chrome-incognito.sh | 0 .../files/google-chrome-socksproxy.sh | 0 {google-chrome => google_chrome}/files/managed.json | 0 {google-chrome => google_chrome}/files/recommended.json | 0 {google-chrome => google_chrome}/tasks/main.yml | 0 nvidia-driver/meta/main.yml | 3 --- nvidia_driver/meta/main.yml | 3 +++ {nvidia-driver => nvidia_driver}/tasks/main.yml | 0 {powertools-repo => powertools_repo}/tasks/main.yml | 0 rpmfusion-nonfree-repo/meta/main.yml | 3 --- .../defaults/main.yml | 0 {rpmfusion-free-repo => rpmfusion_free_repo}/meta/main.yml | 4 ++-- {rpmfusion-free-repo => rpmfusion_free_repo}/tasks/main.yml | 0 .../defaults/main.yml | 0 rpmfusion_nonfree_repo/meta/main.yml | 3 +++ .../tasks/main.yml | 0 17 files changed, 8 insertions(+), 8 deletions(-) rename {epel-repo => epel_repo}/tasks/main.yml (100%) rename {google-chrome => google_chrome}/files/google-chrome-incognito.sh (100%) rename {google-chrome => google_chrome}/files/google-chrome-socksproxy.sh (100%) rename {google-chrome => google_chrome}/files/managed.json (100%) rename {google-chrome => google_chrome}/files/recommended.json (100%) rename {google-chrome => google_chrome}/tasks/main.yml (100%) delete mode 100644 nvidia-driver/meta/main.yml create mode 100644 nvidia_driver/meta/main.yml rename {nvidia-driver => nvidia_driver}/tasks/main.yml (100%) rename {powertools-repo => powertools_repo}/tasks/main.yml (100%) delete mode 100644 rpmfusion-nonfree-repo/meta/main.yml rename {rpmfusion-free-repo => rpmfusion_free_repo}/defaults/main.yml (100%) rename {rpmfusion-free-repo => rpmfusion_free_repo}/meta/main.yml (78%) rename {rpmfusion-free-repo => rpmfusion_free_repo}/tasks/main.yml (100%) rename {rpmfusion-nonfree-repo => rpmfusion_nonfree_repo}/defaults/main.yml (100%) create mode 100644 rpmfusion_nonfree_repo/meta/main.yml rename {rpmfusion-nonfree-repo => rpmfusion_nonfree_repo}/tasks/main.yml (100%) diff --git a/epel-repo/tasks/main.yml b/epel_repo/tasks/main.yml similarity index 100% rename from epel-repo/tasks/main.yml rename to epel_repo/tasks/main.yml diff --git a/google-chrome/files/google-chrome-incognito.sh b/google_chrome/files/google-chrome-incognito.sh similarity index 100% rename from google-chrome/files/google-chrome-incognito.sh rename to google_chrome/files/google-chrome-incognito.sh diff --git a/google-chrome/files/google-chrome-socksproxy.sh b/google_chrome/files/google-chrome-socksproxy.sh similarity index 100% rename from google-chrome/files/google-chrome-socksproxy.sh rename to google_chrome/files/google-chrome-socksproxy.sh diff --git a/google-chrome/files/managed.json b/google_chrome/files/managed.json similarity index 100% rename from google-chrome/files/managed.json rename to google_chrome/files/managed.json diff --git a/google-chrome/files/recommended.json b/google_chrome/files/recommended.json similarity index 100% rename from google-chrome/files/recommended.json rename to google_chrome/files/recommended.json diff --git a/google-chrome/tasks/main.yml b/google_chrome/tasks/main.yml similarity index 100% rename from google-chrome/tasks/main.yml rename to google_chrome/tasks/main.yml diff --git a/nvidia-driver/meta/main.yml b/nvidia-driver/meta/main.yml deleted file mode 100644 index a6fc184..0000000 --- a/nvidia-driver/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - {role: rpmfusion-nonfree-repo} diff --git a/nvidia_driver/meta/main.yml b/nvidia_driver/meta/main.yml new file mode 100644 index 0000000..162efc1 --- /dev/null +++ b/nvidia_driver/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - {role: rpmfusion_nonfree_repo} diff --git a/nvidia-driver/tasks/main.yml b/nvidia_driver/tasks/main.yml similarity index 100% rename from nvidia-driver/tasks/main.yml rename to nvidia_driver/tasks/main.yml diff --git a/powertools-repo/tasks/main.yml b/powertools_repo/tasks/main.yml similarity index 100% rename from powertools-repo/tasks/main.yml rename to powertools_repo/tasks/main.yml diff --git a/rpmfusion-nonfree-repo/meta/main.yml b/rpmfusion-nonfree-repo/meta/main.yml deleted file mode 100644 index ab70223..0000000 --- a/rpmfusion-nonfree-repo/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - {role: rpmfusion-free-repo} diff --git a/rpmfusion-free-repo/defaults/main.yml b/rpmfusion_free_repo/defaults/main.yml similarity index 100% rename from rpmfusion-free-repo/defaults/main.yml rename to rpmfusion_free_repo/defaults/main.yml diff --git a/rpmfusion-free-repo/meta/main.yml b/rpmfusion_free_repo/meta/main.yml similarity index 78% rename from rpmfusion-free-repo/meta/main.yml rename to rpmfusion_free_repo/meta/main.yml index 29010b8..b198adc 100644 --- a/rpmfusion-free-repo/meta/main.yml +++ b/rpmfusion_free_repo/meta/main.yml @@ -1,8 +1,8 @@ --- dependencies: - - role: epel-repo + - role: epel_repo when: ansible_distribution != 'Fedora' - - role: powertools-repo + - role: powertools_repo when: - ansible_distribution != 'Fedora' - ansible_distribution_major_version|int >= 8 diff --git a/rpmfusion-free-repo/tasks/main.yml b/rpmfusion_free_repo/tasks/main.yml similarity index 100% rename from rpmfusion-free-repo/tasks/main.yml rename to rpmfusion_free_repo/tasks/main.yml diff --git a/rpmfusion-nonfree-repo/defaults/main.yml b/rpmfusion_nonfree_repo/defaults/main.yml similarity index 100% rename from rpmfusion-nonfree-repo/defaults/main.yml rename to rpmfusion_nonfree_repo/defaults/main.yml diff --git a/rpmfusion_nonfree_repo/meta/main.yml b/rpmfusion_nonfree_repo/meta/main.yml new file mode 100644 index 0000000..315bac8 --- /dev/null +++ b/rpmfusion_nonfree_repo/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - {role: rpmfusion_free_repo} diff --git a/rpmfusion-nonfree-repo/tasks/main.yml b/rpmfusion_nonfree_repo/tasks/main.yml similarity index 100% rename from rpmfusion-nonfree-repo/tasks/main.yml rename to rpmfusion_nonfree_repo/tasks/main.yml