瀏覽代碼

remove all centos/rocky linux hosts

Douglas A 1 年之前
父節點
當前提交
069a49cde0
共有 8 個文件被更改,包括 60 次插入28 次删除
  1. 0 0
      docker2.yml
  2. 22 8
      hosts
  3. 1 1
      main.yaml
  4. 2 2
      roles/bitwarden/tasks/main.yml
  5. 4 5
      roles/centos/tasks/main.yaml
  6. 27 7
      roles/docker1/tasks/main.yml
  7. 2 5
      roles/packages/tasks/main.yaml
  8. 2 0
      setup-hosts

+ 0 - 0
roles/docker2/tasks/main.yml → docker2.yml


+ 22 - 8
hosts

@@ -1,8 +1,3 @@
-[centos]
-192.168.180.3
-192.168.180.4
-192.168.180.6
-
 [debian]
 192.168.100.3
 192.168.100.4
@@ -14,10 +9,29 @@
 192.168.180.8
 192.168.180.9
 plex.delta.labs.andreanidr.com
-192.168.100.227
+192.168.100.33
+192.168.180.96
+192.168.180.3
+192.168.180.4
+
+[docker1]
+192.168.180.9
+
+[bitwarden]
+192.168.180.8
+
+[freebsd]
+192.168.100.17
+192.168.180.94
+
+[freebsd_jails]
+192.168.100.17
 
 [debian:vars]
 ansible_python_interpreter=/usr/bin/python3
 
-[centos:vars]
-ansible_python_interpreter=/usr/bin/python3
+[freebsd:vars]
+ansible_python_interpreter=/usr/local/bin/python3
+
+[freebsd_jails:vars]
+ansible_python_interpreter=/usr/local/bin/python3

+ 1 - 1
main.yaml

@@ -13,7 +13,7 @@
   become_user: root
   become: yes
   roles: 
-    - { role: centos, tags: centos-update } 
+    - { role: centos, tags: centos-updates } 
     - { role: packages, tags: centos-packages }
 
 - hosts: docker1

+ 2 - 2
roles/bitwarden/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: Tear down existing service
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/bitwarden
     state: absent
 
 - name: Create and start services
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/bitwarden
     state: present
     pull: true

+ 4 - 5
roles/centos/tasks/main.yaml

@@ -1,10 +1,9 @@
 ---
 - name: update the system
-  dnf:
+  ansible.builtin.dnf:
     name: "*"
     state: latest
-- name: start cockpit
-  service:
-    name: cockpit
-    state: started
 
+- name: Autoremove
+  ansible.builtin.dnf:
+    autoremove: true

+ 27 - 7
roles/docker1/tasks/main.yml

@@ -4,28 +4,48 @@
   with_items:
     - docker-compose
 
-
 - name: Tear down existing service - flaresolverr
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/flaresolverr
     state: absent
 
 - name: Create and start services - flaresolverr
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/flaresolverr
     state: present
-    pull: true
   register: output
 
 - name: Tear down existing service - monitoring
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/monitoring
     state: absent
 
 - name: Create and start services - monitoring
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /opt/monitoring
     state: present
-    pull: true
   register: output
 
+- name: Tear down existing service - jenkins-agent
+  community.docker.docker_compose_v2:
+    project_src: /opt/jenkins-agent
+    state: absent
+
+- name: Create and start services - jenkins-agent
+  community.docker.docker_compose_v2:
+    project_src: /opt/jenkins-agent
+    state: present
+  register: output
+
+- name: Tear down existing service - portainer
+  community.docker.docker_compose_v2:
+    project_src: /opt/portainer
+    state: absent
+
+- name: Create and start services - portainer
+  community.docker.docker_compose_v2:
+    project_src: /opt/portainer
+    state: present
+    recreate: always
+    pull: always
+  register: output

+ 2 - 5
roles/packages/tasks/main.yaml

@@ -17,9 +17,6 @@
   with_items:
     - lsb-release
     - build-essential
+    - unattended-upgrades
+
 
-- name: install centos specific packages
-  package: name={{ item }} state=latest
-  when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' or ansible_distribution == 'Rocky'
-  with_items:
-    - epel-release

+ 2 - 0
setup-hosts

@@ -0,0 +1,2 @@
+[debian]
+192.168.180.8 ansible_user=cmte