Use archlinux-contrib over git submodule

Prefer using our maintained version of checkservices from the contrib
repository hosted on our Gitlab repository. This has the benefit of
getting rid of a submodule which isn't cloned by default.
This commit is contained in:
Jelle van der Waa 2020-08-16 16:53:09 +02:00 committed by Sven-Hendrik Haase
parent b3b7dfd2d3
commit d9fdafb0b1
4 changed files with 7 additions and 11 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "roles/common/files/contrib"]
path = roles/common/files/contrib
url = https://github.com/archlinux/contrib

View file

@ -2,9 +2,6 @@
This repository contains the complete collection of ansible playbooks and roles for the Arch Linux infrastructure.
It also contains git submodules so you have to run `git submodule update --init
--recursive` after cloning or some tasks will fail to run.
## Requirements
Install these packages:

@ -1 +0,0 @@
Subproject commit 7c791d4179daab4f108b14bbc19bfaf60db4cf8a

View file

@ -151,11 +151,14 @@
- zshrc
- dircolors
- name: install checkservices
copy: src=contrib/admin/checkservices dest=/usr/local/bin/checkservices owner=root group=root mode=0755
- name: install pacman-contrib,archlinux-contrib
pacman: name=pacman-contrib,archlinux-contrib state=installed
- name: install pacman-contrib
pacman: name=pacman-contrib state=installed
- name: remove old checkservices copied script (from submodule)
file: path=/usr/local/bin/checkservices state=absent
- name: symlink checkservices to /usr/local/bin
file: src=/usr/share/archlinux/contrib/admin/checkservices dest=/usr/local/bin/checkservices state=link
- name: install pacman config
template: src=pacman.conf.j2 dest=/etc/pacman.conf mode=0644 owner=root group=root