Merge pull request #9 from adfinis/feat/git_submodules

feat: manage standalone roles with git submodules
adfinis · Jun 27, 2024 · 90e368d · 90e368d
2 parents a33ebb4 + bf62f4c
commit 90e368d
Show file tree

Hide file tree

Showing 103 changed files with 31 additions and 8,169 deletions.
diff --git a/.github/workflows/collection.yml b/.github/workflows/collection.yml
@@ -12,7 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v4
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
 
       - name: Set version in galaxy.yml
         run: |

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,18 @@
+[submodule "roles/bareos_repository"]
+	path = roles/bareos_repository
+	url = https://github.com/adfinis/ansible-role-bareos_repository
+[submodule "roles/bareos_webui"]
+	path = roles/bareos_webui
+	url = https://github.com/adfinis/ansible-role-bareos_webui
+[submodule "roles/bareos_dir"]
+	path = roles/bareos_dir
+	url = https://github.com/adfinis/ansible-role-bareos_dir
+[submodule "roles/bareos_sd"]
+	path = roles/bareos_sd
+	url = https://github.com/adfinis/ansible-role-bareos_sd
+[submodule "roles/bareos_fd"]
+	path = roles/bareos_fd
+	url = https://github.com/adfinis/ansible-role-bareos_fd
+[submodule "roles/bareos_console"]
+	path = roles/bareos_console
+	url = https://github.com/adfinis/ansible-role-bareos_console
diff --git a/UPDATING.md b/UPDATING.md
@@ -1,17 +1,5 @@
 # Updating the roles
 
-1. Delete the roles:
-
-```shell
-rm -Rf roles/*
-```
-
-2. Copy the roles in:
-
-```shell
-./UPDATING.sh
-```
-
-3. Update galaxy.yml
-
-Bump version.
+Roles in collection are managed as [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
+* Changes can be fetched with `git fetch`.
+* To pull changes for specific role, run: `git submodule update --remote <role name>` (Example: `git submodule update --remote roles/bareos_repository`).
diff --git a/UPDATING.sh b/UPDATING.sh
diff --git a/roles/bareos_console b/roles/bareos_console
diff --git a/roles/bareos_console/LICENSE b/roles/bareos_console/LICENSE
diff --git a/roles/bareos_console/README.md b/roles/bareos_console/README.md
diff --git a/roles/bareos_console/defaults/main.yml b/roles/bareos_console/defaults/main.yml
diff --git a/roles/bareos_console/meta/argument_specs.yml b/roles/bareos_console/meta/argument_specs.yml
diff --git a/roles/bareos_console/meta/main.yml b/roles/bareos_console/meta/main.yml
diff --git a/roles/bareos_console/requirements.yml b/roles/bareos_console/requirements.yml
diff --git a/roles/bareos_console/tasks/assert.yml b/roles/bareos_console/tasks/assert.yml
diff --git a/roles/bareos_console/tasks/main.yml b/roles/bareos_console/tasks/main.yml
diff --git a/roles/bareos_console/templates/.gitkeep b/roles/bareos_console/templates/.gitkeep
diff --git a/roles/bareos_console/templates/bconsole.conf.j2 b/roles/bareos_console/templates/bconsole.conf.j2
diff --git a/roles/bareos_dir b/roles/bareos_dir