Skip to content

Commit

Permalink
An actually working user-data file + other stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
notthebee committed Sep 1, 2021
1 parent 41e54df commit 70d02fd
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 49 deletions.
7 changes: 3 additions & 4 deletions ansible/group_vars/all/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,22 +182,21 @@ snapraid_runner_smtp_host: "{{ email_smtp_host }}"

snapraid_runner_smtp_port: "{{ email_smtp_port }}"

snapraid_runner_delete_threshold: 5000

snapraid_runner_email_sendon: "error"

snapraid_runner_use_ssl: true

content_file: "{{ disks[0].name }}/snapraid.content"

snapraid_content_files:
- "{{ content_file }}"
- /var/snapraid.content

snapraid_config_excludes:
- "*.unrecoverable"
- /lost+found/
- "*.!sync"
- /tmp/
- "Downloads"
- "/Downloads/*"


#
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/avahi/templates/samba.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<service>
<type>_device-info._tcp</type>
<port>0</port>
<txt-record>model=Xserve</txt-record>
<txt-record>model=TimeCapsule</txt-record>
</service>
</service-group>
2 changes: 2 additions & 0 deletions ansible/roles/essential/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
repo: "{{ dotfiles_repo }}"
dest: /home/{{ username }}/dotfiles
recursive: no
force: yes

- name: Stow the dotfiles
shell: cd /home/{{ username }}/dotfiles && stow -v */
Expand All @@ -76,6 +77,7 @@
regexp: 'fish_greeting:.+'
line: 'SETUVAR fish_greeting:'
when: '"fish" in shell'
ignore_errors: true

- name: Set the correct ownership for the user's home folder (not using ansible.builtin.file because of idempotency)
shell:
Expand Down
44 changes: 0 additions & 44 deletions cloud-init/cloud-init.yml

This file was deleted.

37 changes: 37 additions & 0 deletions cloud-init/user-data
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#cloud-config
autoinstall:
version: 1
locale: en_us.UTF-8
keyboard:
layout: us
identity:
hostname: fragile
password: "$1$xyz$7ujQcnF8S3A6JQDF2fcsc/"
username: notthebee
network:
network:
version: 2
ethernets:
enp1s0:
critical: true
dhcp-identifier: mac
dhcp4: true
ssh:
install-server: true
authorized-keys: [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKGUGMUo1dRl9xoDlMxQGb8dNSY+6xiEpbZWAu6FAbWw [email protected]" ]
storage:
grub:
reorder_uefi: False
swap:
size: 0
config:
- {ptable: gpt, serial: HFS128G39TNF-N3A0A_MJ89N5458114A9M3C, preserve: false, name: '', grub_device: false, type: disk, id: bootdrive}

- {device: bootdrive, size: 536870912, wipe: superblock, flag: boot, number: 1, preserve: false, grub_device: true, type: partition, id: efipart}
- {fstype: fat32, volume: efipart, preserve: false, type: format, id: efi}

- {device: bootdrive, size: -1, wipe: superblock, flag: linux, number: 2, preserve: false, grub_device: false, type: partition, id: rootpart}
- {fstype: ext4, volume: rootpart, preserve: false, type: format, id: root}

- {device: root, path: /, type: mount, id: rootmount}
- {device: efi, path: /boot/efi, type: mount, id: efimount}

0 comments on commit 70d02fd

Please sign in to comment.