Minor cleanup

This commit is contained in:
Kris Lamoureux 2022-05-27 23:14:06 -04:00
parent 330f2b5a91
commit 3a92921932
Signed by: kris
GPG Key ID: 3EDA9C3441EDA925
9 changed files with 12 additions and 39 deletions

View File

@ -12,8 +12,3 @@
dest: "/etc/network/interfaces.d/{{ item.name }}" dest: "/etc/network/interfaces.d/{{ item.name }}"
loop: "{{ interfaces }}" loop: "{{ interfaces }}"
notify: reboot_host notify: reboot_host
- name: Install bridge utilities
apt:
name: bridge-utils
state: present

View File

@ -10,12 +10,6 @@
dest: /root/.ssh/authorized_keys dest: /root/.ssh/authorized_keys
when: authorized_keys is defined when: authorized_keys is defined
- name: Install btrfs-tools
apt:
name: btrfs-tools
state: present
when: btrfs_support is defined and btrfs_support | bool == true
- name: Manage filesystem mounts - name: Manage filesystem mounts
mount: mount:
path: "{{ item.path }}" path: "{{ item.path }}"

View File

@ -1,25 +1,3 @@
# Copyright (C) 2021 Kris Lamoureux
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
- name: Add Debian Buster backports
copy:
src: buster-backports.list
dest: /etc/apt/sources.list.d/buster-backports.list
owner: root
group: root
mode: '0644'
- name: Install WireGuard - name: Install WireGuard
apt: apt:
name: wireguard name: wireguard

View File

@ -1,5 +1,5 @@
bitwarden_name: bitwarden bitwarden_name: bitwarden
bitwarden_root: "{{ docker_root }}/{{ bitwarden_name }}" bitwarden_root: "/var/lib/{{ bitwarden_name }}"
bitwarden_database: "{{ bitwarden_name }}" bitwarden_database: "{{ bitwarden_name }}"
bitwarden_standalone: false bitwarden_standalone: false
bitwarden_production: false bitwarden_production: false

View File

@ -1,3 +1,3 @@
docker_root: /var/lib/docker-compose docker_compose_root: /var/lib/compose
docker_compose: /usr/bin/docker-compose docker_compose: /usr/bin/docker-compose
docker_compose_service: compose docker_compose_service: compose

View File

@ -6,7 +6,7 @@
- name: Create docker-compose root - name: Create docker-compose root
file: file:
path: "{{ docker_root }}" path: "{{ docker_compose_root }}"
state: directory state: directory
- name: Install docker-compose systemd service - name: Install docker-compose systemd service

View File

@ -6,7 +6,7 @@ After=docker.service
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=true RemainAfterExit=true
WorkingDirectory={{ docker_root }}/%i WorkingDirectory={{ docker_compose_root }}/%i
ExecStart={{ docker_compose }} up -d --remove-orphans ExecStart={{ docker_compose }} up -d --remove-orphans
ExecStop={{ docker_compose }} down ExecStop={{ docker_compose }} down

View File

@ -15,4 +15,4 @@ gitea_dbname: "{{ gitea_name }}"
gitea_dbuser: "{{ gitea_name }}" gitea_dbuser: "{{ gitea_name }}"
# host # host
gitea_root: "{{ docker_root }}/{{ gitea_name }}" gitea_root: "{{ docker_compose_root }}/{{ gitea_name }}"

View File

@ -46,16 +46,22 @@
src: /home/git/.ssh/id_rsa.pub src: /home/git/.ssh/id_rsa.pub
register: git_rsapub register: git_rsapub
- name: Get stats on git's authorized_keys file
stat:
path: /home/git/.ssh/authorized_keys
register: git_authkeys
- name: Create git's authorized_keys file - name: Create git's authorized_keys file
file: file:
path: /home/git/.ssh/authorized_keys path: /home/git/.ssh/authorized_keys
state: touch state: touch
when: not git_authkeys.stat.exists
- name: Add git's public SSH key to authorized_keys - name: Add git's public SSH key to authorized_keys
lineinfile: lineinfile:
path: /home/git/.ssh/authorized_keys path: /home/git/.ssh/authorized_keys
regex: "^ssh-rsa"
line: "{{ git_rsapub['content'] | b64decode }}" line: "{{ git_rsapub['content'] | b64decode }}"
insertbefore: BOF
- name: Create Gitea host script for SSH - name: Create Gitea host script for SSH
template: template: