Move requirements.yml to root

.gitlab-ci.yml

@@ -33,7 +33,7 @@ before_script:
     zerotier-cli info && \
     zerotier-cli listnetworks
   # Get ready for execution
-  - ansible-galaxy install -r roles/requirements.yml -p roles
+  - ansible-galaxy install -r requirements.yml
 after_script:
   - |
     [ -n "$ZEROTIER_NETWORK_ID" ] && \

contrib/docker.sh

@@ -48,7 +48,7 @@ if [ -n "$ANSIBLE_SSH_KEY" ]; then
 	chown ansible. /etc/ansible
 	sudo -u ansible rsync -aHS /etc/ansible.orig/ /etc/ansible/ --exclude .git
 	printf '\e[37mInstalling roles...\e[0m\n'
-	sudo -u ansible ansible-galaxy install -r roles/requirements.yml -p roles
+	sudo -u ansible ansible-galaxy install -r requirements.yml
 	cd /etc/ansible
 
 	# Drop to the ansible user

requirements.yml

@@ -0,0 +1,53 @@
+# vim:ft=ansible
+# To install, use pip-style invocation:
+#  ansible-galaxy install -r requirements.yml
+
+roles:
+  # Upstream: https://github.com/willshersystems/ansible-sshd
+  - name: sshd
+    src: willshersystems.sshd
+    version: v0.12.0
+  # Upstream: https://github.com/bertvv/ansible-role-dhcp
+  - name: dhcp
+    src: bertvv.dhcp
+    version: master
+  # Upstream: https://github.com/geerlingguy/ansible-role-nfs
+  - name: nfs
+    src: geerlingguy.nfs
+    version: 2.0.0
+  # Upstream: https://github.com/geerlingguy/ansible-role-docker
+  - name: docker
+    src: geerlingguy.docker
+    version: 3.0.0
+  # Upstream: https://github.com/geerlingguy/ansible-role-kubernetes
+  - name: k8s
+    src: geerlingguy.kubernetes
+    version: 5.0.1
+  # Upstream: https://github.com/geerlingguy/ansible-role-postgresql
+  - name: postgresql
+    src: geerlingguy.postgresql
+    version: 2.2.1
+  # Upstream: https://github.com/geerlingguy/ansible-role-certbot
+  - name: certbot
+    src: geerlingguy.certbot
+    version: 3.1.0
+  # Upstream: https://github.com/geerlingguy/ansible-role-apache
+  - name: apache
+    src: geerlingguy.apache
+    version: 3.1.0
+  # Upstream: https://github.com/geerlingguy/ansible-role-php
+  - name: php
+    src: geerlingguy.php
+    version: 4.5.1
+  # Upstream: https://github.com/thomas-maurice/ansible-role-gitea
+  - name: gitea
+    src: thomas_maurice.ansible_role_gitea
+    version: master
+  # Upstream: https://github.com/nkakouros-original/ansible-role-nextcloud
+  - name: nextcloud
+    src: nkakouros.nextcloud
+    version: master
+  # Upstream: https://github.com/bplower/ansible-factorio
+  - name: factorio
+    src: bplower.factorio
+    version: master

roles/requirements.yml

@@ -1,77 +0,0 @@
-# vim:ft=ansible
-# To install, use pip-style invocation:
-#  ansible-galaxy install -r requirements.yml
-
-# MAD PROPS to geerlingguy; if for some reason you end up reading this, hit me
-# up and I'll buy you a beer or a pizza or something.
-
-# SSHD
-# Upstream: https://github.com/willshersystems/ansible-sshd
-- src: willshersystems.sshd
-  version: v0.12.0
-  name: sshd
-
-# DHCP
-# Upstream: https://github.com/bertvv/ansible-role-dhcp
-- src: bertvv.dhcp
-  version: master
-  name: dhcp
-
-# NFS
-# Upstream: https://github.com/geerlingguy/ansible-role-nfs
-- src: geerlingguy.nfs
-  version: 2.0.0
-  name: nfs
-
-# Orchestration
-# Upstream: https://github.com/geerlingguy/ansible-role-docker
-- src: geerlingguy.docker
-  version: 3.0.0
-  name: docker
-# Upstream: https://github.com/geerlingguy/ansible-role-kubernetes
-- src: geerlingguy.kubernetes
-  version: 5.0.1
-  name: k8s
-
-# DB Server stuff
-# Upstream: https://github.com/geerlingguy/ansible-role-postgresql
-- src: geerlingguy.postgresql
-  version: 2.2.1
-  name: postgresql
-
-# Monitoring
-# TODO: Find something that doesn't suck
-
-# Webserver stuff
-# Upstream: https://github.com/geerlingguy/ansible-role-certbot
-- src: geerlingguy.certbot
-  version: 3.1.0
-  name: certbot
-# Upstream: https://github.com/geerlingguy/ansible-role-apache
-- src: geerlingguy.apache
-  version: 3.1.0
-  name: apache
-# Upstream: https://github.com/geerlingguy/ansible-role-php
-- src: geerlingguy.php
-  version: 4.5.1
-  name: php
-
-# Web applications
-# Upstream: https://github.com/thomas-maurice/ansible-role-gitea
-- src: thomas_maurice.ansible_role_gitea
-  version: master
-  name: gitea
-# Upstream: https://github.com/nkakouros-original/ansible-role-nextcloud
-- src: nkakouros.nextcloud
-  version: master
-  name: nextcloud
-# Upstream: https://github.com/ONLYOFFICE/ansible-role-documentserver
-- src: onlyoffice.documentserver
-  version: v1.0.3
-  name: onlyoffice
-
-# Game Servers
-# Upstream: https://github.com/bplower/ansible-factorio
-- src: bplower.factorio
-  version: master
-  name: factorio