From 5ed08e0f1ad84b1f2e96daf1e6f01d07a3092d5f Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sat, 25 Feb 2023 15:42:28 +0100 Subject: [PATCH] move dataserver to seperate repo --- inventory/group_vars/dataserver.yml | 1 - inventory/hosts.yml | 5 --- playbooks/all.yml | 4 -- roles/dataserver/files/ssh_host_ed25519_key | 25 ----------- roles/dataserver/tasks/main.yml | 44 ------------------- .../templates/ssh_host_ed25519_key.pub.j2 | 1 - 6 files changed, 80 deletions(-) delete mode 100644 inventory/group_vars/dataserver.yml delete mode 100644 roles/dataserver/files/ssh_host_ed25519_key delete mode 100644 roles/dataserver/tasks/main.yml delete mode 100644 roles/dataserver/templates/ssh_host_ed25519_key.pub.j2 diff --git a/inventory/group_vars/dataserver.yml b/inventory/group_vars/dataserver.yml deleted file mode 100644 index 813eb06..0000000 --- a/inventory/group_vars/dataserver.yml +++ /dev/null @@ -1 +0,0 @@ -kingston1tb_uuid: "622a8d81-aa2f-460b-a563-c3cdb6285609" diff --git a/inventory/hosts.yml b/inventory/hosts.yml index 6391b99..4803701 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -5,8 +5,3 @@ all: max: ansible_user: root ansible_host: max.lan - dataserver: - hosts: - lewis: - ansible_user: root - ansible_host: lewis.lan diff --git a/playbooks/all.yml b/playbooks/all.yml index 8add242..c27e7d6 100644 --- a/playbooks/all.yml +++ b/playbooks/all.yml @@ -16,7 +16,3 @@ - {role: 'static', tags: 'static'} - {role: 'inbucket', tags: 'inbucket'} - {role: 'prometheus', tags: 'prometheus'} -- name: Setup dataserver - hosts: dataserver - roles: - - {role: 'dataserver', tags: 'dataserver'} diff --git a/roles/dataserver/files/ssh_host_ed25519_key b/roles/dataserver/files/ssh_host_ed25519_key deleted file mode 100644 index 1629458..0000000 --- a/roles/dataserver/files/ssh_host_ed25519_key +++ /dev/null @@ -1,25 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -38633038656332643033396338303864343332636434633331366266383235316235313236646361 -6634313931303637616535373966316165656564366437330a393465356237626631303063363061 -62323737343635316139636664663937333233323737376238656566633037613938383737306132 -6237633230623962320a643433323532646261366532346234653332323336653162366433626465 -31386461393535303730333865356364646137386634643630353831383039353763396536313439 -30333335623364306166346232303862633636633066323062313531363234396362653232316261 -36666132623030323332623334323632636639646239363032626364646334643461346662616366 -39656266643937663531656137353031353130366238326535383261333539353439353566313537 -38353632353039643530613766313033313063333331333733613939383731663262623766626266 -64363061306166353633333634363332633461346538316661666364626639366132356434343631 -61373432633863643237386435386633366161393934646562343261386335353638353033343932 -62393633366163613064393966663830646237613265396462376238396639363566363865303861 -36343666326632626166323430303137323236346137346131623636653236353061343633383437 -61396534636166353038626162376335363137636164616631646261366332303135306237356432 -61626261656332666536343039316333303431653931666233363366613166663266663130656633 -39316363326532653665626136393135373863383234326638303466353930653038303433643536 -30666237363230306634333162396562623034386232666465343631306433373764626634613635 -63343965623163356536626162613863373033396565366361353538323933656165653932653937 -34666538353139636366333765363733336134396566613134303530633666326165306131353535 -33653133663166333964326330366530643730363861626261666366383334613661303762636663 -34376531343732346630643466616638323537633665373333346162306361393836326533636630 -61656335306337643930613662613832626530653630343566643661356666313331316438366538 -37333166636639363838303665626137643731626338356662656338393335343239376635303633 -35663237653238313133 diff --git a/roles/dataserver/tasks/main.yml b/roles/dataserver/tasks/main.yml deleted file mode 100644 index 8d5d72e..0000000 --- a/roles/dataserver/tasks/main.yml +++ /dev/null @@ -1,44 +0,0 @@ -- name: Add admins' authorized keys - authorized_key: - key: "{{ item }}" - user: "{{ ansible_user_id }}" - loop: "{{ admin_public_keys }}" -- name: Copy host public key - template: - src: "{{ role_path }}/templates/ssh_host_ed25519_key.pub.j2" - dest: "/etc/ssh/ssh_host_ed25519_key.pub" - mode: 0644 -- name: Copy host private key - copy: - src: "{{ role_path }}/files/ssh_host_ed25519_key" - dest: "/etc/ssh/ssh_host_ed25519_key" - mode: 0600 -- name: APT upgrade - apt: - autoremove: true - upgrade: yes - state: latest - update_cache: yes - cache_valid_time: 86400 # One day -- name: Create extra disk moint point - file: - path: "{{ kingston1tb_mount_point }}" - state: directory -- name: Mount extra disk - ansible.posix.mount: - path: "{{kingston1tb_mount_point }}" - src: "UUID={{ kingston1tb_uuid }}" - fstype: ext4 - passno: 1 - state: present -- name: Install borg - apt: - name: borgbackup -- name: Add Borg public key - authorized_key: - key: "ssh-ed25519 {{ borg_public_key }} root@max" - user: "{{ ansible_user_id }}" -- name: Create Borg repository - command: - cmd: "borg init -e none {{ backup_location }}" - creates: "{{ backup_location }}" diff --git a/roles/dataserver/templates/ssh_host_ed25519_key.pub.j2 b/roles/dataserver/templates/ssh_host_ed25519_key.pub.j2 deleted file mode 100644 index 08b6b21..0000000 --- a/roles/dataserver/templates/ssh_host_ed25519_key.pub.j2 +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 {{ dataserver_public_key }} root@lewis