From eb5d898df4a354186e193e31dbba86e370ede455 Mon Sep 17 00:00:00 2001 From: Dirk Wirts Date: Fri, 1 Dec 2023 13:35:32 +0100 Subject: [PATCH] =?UTF-8?q?Erg=C3=A4nzungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inventories/test/docker05.inv | 2 +- .../{ansible-docker05.yml => docker05.yml} | 12 ++++----- ansible-setup_docker.yml | 26 +++++++++++++++++++ setups/docker-compose.yml | 3 ++- setups/install-ansible.sh | 8 ++++-- setups/pw-file.txt | 1 + setups/setup.info | 4 +++ 7 files changed, 46 insertions(+), 10 deletions(-) rename Inventories/test/host_vars/{ansible-docker05.yml => docker05.yml} (83%) create mode 100644 setups/pw-file.txt diff --git a/Inventories/test/docker05.inv b/Inventories/test/docker05.inv index 0284c6b..c5be730 100644 --- a/Inventories/test/docker05.inv +++ b/Inventories/test/docker05.inv @@ -1 +1 @@ -ansible-docker05 ansible_host=172.20.1.169 hostname=ansible-docker05 \ No newline at end of file +docker05 ansible_host=10.230.255.154 hostname=docker05 \ No newline at end of file diff --git a/Inventories/test/host_vars/ansible-docker05.yml b/Inventories/test/host_vars/docker05.yml similarity index 83% rename from Inventories/test/host_vars/ansible-docker05.yml rename to Inventories/test/host_vars/docker05.yml index 147d653..fd1b06c 100644 --- a/Inventories/test/host_vars/ansible-docker05.yml +++ b/Inventories/test/host_vars/docker05.yml @@ -1,14 +1,14 @@ interface_name: "Wired connection 1" -static_ip: 172.20.1.33 +static_ip: 10.230.255.10 netmask: 0/24 netmask2: 24 -gateway: 172.20.1.251 +gateway: 10.230.255.254 dns_servers: - - 172.20.1.251 - - 172.20.1.10 - - 172.20.1.11 + - 10.230.255.254 + - 172.16.1.1 + - 172.16.1.2 - 8.8.8.8 -new_hostname: "ansible-docker05" +new_hostname: "docker05" timezone: "Europe/Berlin" required_pkgs: - ufw diff --git a/ansible-setup_docker.yml b/ansible-setup_docker.yml index 079b37a..521e16c 100644 --- a/ansible-setup_docker.yml +++ b/ansible-setup_docker.yml @@ -65,3 +65,29 @@ name: docker-autostart.service enabled: yes state: started + + - name: Benutzer anlegen + user: + name: dockeruser + comment: Docker Benutzer + shell: /bin/bash + create_home: yes + + - name: Benutzer zur Docker-Gruppe hinzufügen + user: + name: dockeruser + group: docker + append: yes + + - name: Create docker directory + file: + path: "/mnt/docker" + state: directory + mode: '0755' + + - name: Create docker semaphore directory + file: + path: "/mnt/docker/semaphore" + state: directory + mode: '0755' + diff --git a/setups/docker-compose.yml b/setups/docker-compose.yml index fe9846c..a032dd9 100644 --- a/setups/docker-compose.yml +++ b/setups/docker-compose.yml @@ -16,6 +16,7 @@ services: - MYSQL_PASSWORD=0semaphore # change! restart: unless-stopped semaphore: + build: . container_name: ansiblesemaphore # image: ghcr.io/andygeorge/semaphore-pip-ansible:latest # image: semaphoreui/semaphore:latest @@ -32,7 +33,7 @@ services: - SEMAPHORE_DB_DIALECT=mysql - SEMAPHORE_DB=semaphore - SEMAPHORE_PLAYBOOK_PATH=/tmp/semaphore/ - - SEMAPHORE_ADMIN_PASSWORD=hawkmoon # change! + - SEMAPHORE_ADMIN_PASSWORD=apt install hawkmoon # change! - SEMAPHORE_ADMIN_NAME=admin - SEMAPHORE_ADMIN_EMAIL=admin@localhost - SEMAPHORE_ADMIN=admin diff --git a/setups/install-ansible.sh b/setups/install-ansible.sh index 9ed788e..f447123 100644 --- a/setups/install-ansible.sh +++ b/setups/install-ansible.sh @@ -6,11 +6,15 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi +set -e +PUBKEY="ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAEuwAZEN/DNkr1KkBsHdw1kRV964httL4gqpstBgComJy549miU2Cul0ozyl76qv8L6BNCzQywW86Kbb2h8glufSwCDwbcZpmQUN4lRDctrWHUU8R2mPLwSQfFqc+AVYomotegaVOnSwQzpOkTJIv94LWI3Amsfo0L/2V8JY0cb3WNMIg== root@ansible-host" + # Update and Upgrade the System apt update && apt upgrade -y # Install sudo and other necessary packages -apt install -y sudo openssh-server +apt install -y sudo openssh-server curl gnupg2 + # Create the ansible user useradd -m -s /bin/bash ansible @@ -22,7 +26,7 @@ touch /home/ansible/.ssh/authorized_keys chmod 600 /home/ansible/.ssh/authorized_keys # Replace 'your_public_key' with the actual public key -echo 'your_public_key' > /home/ansible/.ssh/authorized_keys +echo "$PUBKEY" > /home/ansible/.ssh/authorized_keys # Change ownership of the .ssh directory to the ansible user chown -R ansible:ansible /home/ansible/.ssh diff --git a/setups/pw-file.txt b/setups/pw-file.txt new file mode 100644 index 0000000..ace4d9b --- /dev/null +++ b/setups/pw-file.txt @@ -0,0 +1 @@ +hXpz2xi@#FfJq-R@unjR \ No newline at end of file diff --git a/setups/setup.info b/setups/setup.info index e6f222a..b0075e1 100644 --- a/setups/setup.info +++ b/setups/setup.info @@ -1,5 +1,9 @@ Hier sind die Schritte zur Installation aufgeführt --------------------------------------------------- +Ansible Docker Host einrichten + 1. shell script (install-ansible.sh) Kopieren /root -> ausführen + 2. ansible-setup_docker.yml + 3. copy dockerfile & docker-compose.yml nach /mnt/docker/semaphore Ansible docker05 Testlauf 1. Linux VM aufsetzen