diff --git a/examples/msn0.yml b/examples/msn0.yml index 28bb55f..9e4a78a 100644 --- a/examples/msn0.yml +++ b/examples/msn0.yml @@ -61,6 +61,32 @@ all: ip: 10.0.1.8 mac: B2:C6:2C:02:B2:6E tap: true + Nodelet0: + ipinterface: eth0 + ip: 10.0.1.9 + mac: b8:27:eb:9a:73:dd + static: true + k3s_primary: true + Nodelet1: + ipinterface: eth0 + ip: 10.0.1.10 + mac: E4:5F:01:01:FF:9C + static: true + Nodelet2: + ipinterface: eth0 + ip: 10.0.1.11 + mac: E4:5F:01:01:FF:D5 + static: true + Nodelet3: + ipinterface: eth0 + ip: 10.0.1.12 + mac: E4:5F:01:01:FF:96 + static: true + Nodelet4: + ipinterface: eth0 + ip: 10.0.1.13 + mac: E4:5F:01:01:FF:E4 + static: true virtual: # 10.0.1.16/28 vars: hosts: @@ -90,6 +116,7 @@ all: bridge: br0 disks: - '-drive format=raw,index=0,media=disk,file=/dev/sdb' + wolfpack_config: 'gitea@foundation.aninix.net:DarkFeather/WolfPack-Config.git' Maat: node: Node2 ip: 10.0.1.18 diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml index 889d068..b2aa1e2 100644 --- a/playbooks/deploy.yml +++ b/playbooks/deploy.yml @@ -34,7 +34,7 @@ - SSH - Sharingan -- hosts: Core +- hosts: Yggdrasil order: sorted serial: "{{ threads | default('16') }}" gather_facts: true @@ -46,6 +46,9 @@ - SSL - WebServer - IRC + - WolfPack + - Foundation + - Yggrasil - hosts: geth_hubs order: sorted @@ -77,3 +80,4 @@ - "{{ lookup('env', 'ANSIBLE_VAULT_FILE') }}" roles: - DarkNet + - WolfPack diff --git a/roles/WolfPack/files/Yggdrasil/aninix-searches.pup b/roles/WolfPack/files/Yggdrasil/aninix-searches.pup index 22a040e..2bd31cf 100644 --- a/roles/WolfPack/files/Yggdrasil/aninix-searches.pup +++ b/roles/WolfPack/files/Yggdrasil/aninix-searches.pup @@ -1,3 +1,3 @@ search -/srv/wolfpack/search-results +/srv/wolfpack/ aninix.net diff --git a/roles/WolfPack/files/Yggdrasil/archlinux.pup b/roles/WolfPack/files/Yggdrasil/archlinux.pup index 098d71e..4578b21 100644 --- a/roles/WolfPack/files/Yggdrasil/archlinux.pup +++ b/roles/WolfPack/files/Yggdrasil/archlinux.pup @@ -1,4 +1,4 @@ download -/usr/local/src/isos/ -wget -q -O - 'https://www.archlinux.org/download/' | grep rackspace | cut -f 2 -d \" | head -n 1 -echo PREVRESULT/$(wget -q -O - PREVRESULT | grep x86_64.iso | head -n 1 | cut -f 2 -d \") +/srv/wolfpack +curl -s 'https://mirror.rackspace.com/archlinux/iso/latest/' | grep -m 1 x86_64.iso | cut -f 2 -d \" +echo https://mirror.rackspace.com/archlinux/iso/latest/PREVRESULT diff --git a/roles/WolfPack/files/Yggdrasil/centos.pup b/roles/WolfPack/files/Yggdrasil/centos.pup deleted file mode 100644 index 30af80f..0000000 --- a/roles/WolfPack/files/Yggdrasil/centos.pup +++ /dev/null @@ -1,3 +0,0 @@ -download -/usr/local/src/isos -curl -s https://centos.org/download/ | grep Minimal | grep 'a href' | cut -f 2 -d '"' diff --git a/roles/WolfPack/files/Yggdrasil/chrome.pup b/roles/WolfPack/files/Yggdrasil/chrome.pup deleted file mode 100644 index a0a7ce6..0000000 --- a/roles/WolfPack/files/Yggdrasil/chrome.pup +++ /dev/null @@ -1,5 +0,0 @@ -download -/srv/wolfpack/ -curl -s https://portableapps.com/apps/internet/google_chrome_portable | tr '<' '\n' | tr '>' '\n' | tr \" '\n' | grep online.paf.exe | sed 's/ /\%20/g' | sed 's/\&/\\\&/g' -curl -s https://portableapps.comPREVRESULT | tr '"' '\n' | grep redirect | tail -n 1 -echo https://portableapps.comPREVRESULT diff --git a/roles/WolfPack/files/Yggdrasil/cnews.pup b/roles/WolfPack/files/Yggdrasil/cnews.pup deleted file mode 100644 index 31fb2c7..0000000 --- a/roles/WolfPack/files/Yggdrasil/cnews.pup +++ /dev/null @@ -1,3 +0,0 @@ -search -/srv/wolfpack/ -Riffle diff --git a/roles/WolfPack/files/Yggdrasil/cshows.DarkNet b/roles/WolfPack/files/Yggdrasil/cshows.DarkNet deleted file mode 100644 index 5a5a2c8..0000000 --- a/roles/WolfPack/files/Yggdrasil/cshows.DarkNet +++ /dev/null @@ -1,11 +0,0 @@ -shows -/srv/yggdrasil/new_acquisition -S06E11#Game of Thrones -S04E21#Vikings# -S02E13#Mr Robot#HDTV -S02E12#Marco Polo -S02E12#Criminal Minds Beyond Borders# -S02E14#Dark Matter#ettv -S03E22#Star Wars Rebels# -S02E11#Shadowhunters# -S03E18#Gotham# diff --git a/roles/WolfPack/files/Yggdrasil/eminem.pup b/roles/WolfPack/files/Yggdrasil/eminem.pup index c7ec9a3..57191ea 100644 --- a/roles/WolfPack/files/Yggdrasil/eminem.pup +++ b/roles/WolfPack/files/Yggdrasil/eminem.pup @@ -1,4 +1,4 @@ search -/srv/wolfpack/search-results +/srv/wolfpack Eminem Shows Eminem Concerts diff --git a/roles/WolfPack/files/Yggdrasil/ftor.DarkNet b/roles/WolfPack/files/Yggdrasil/ftor.DarkNet deleted file mode 100644 index 42fcba8..0000000 --- a/roles/WolfPack/files/Yggdrasil/ftor.DarkNet +++ /dev/null @@ -1,8 +0,0 @@ -torrent -/srv/yggdrasil/new_acquisition -King Arthur 2017 BRrip -The Great Wall 2017 BRrip -Edge of 17 2016 BRrip -Bilal: A New Breed of Hero 2015 -John Wick Chapter 2 2017 HDrip -Fast 8 HDRip 2017 diff --git a/roles/WolfPack/files/Yggdrasil/kali-arm.pup b/roles/WolfPack/files/Yggdrasil/kali-arm.pup deleted file mode 100644 index 1ca1228..0000000 --- a/roles/WolfPack/files/Yggdrasil/kali-arm.pup +++ /dev/null @@ -1,3 +0,0 @@ -download -/usr/local/src/isos/ -elinks --dump https://www.offensive-security.com/kali-linux-arm-images/ | grep rpi | head -n 1 | sed 's/^\s\+//' diff --git a/roles/WolfPack/files/Yggdrasil/kali-linux.pup b/roles/WolfPack/files/Yggdrasil/kali-linux.pup index 6ade879..6a1c5c7 100644 --- a/roles/WolfPack/files/Yggdrasil/kali-linux.pup +++ b/roles/WolfPack/files/Yggdrasil/kali-linux.pup @@ -1,4 +1,4 @@ download -/usr/local/src/isos/ -wget -q -O - http://cdimage.kali.org/current/ | grep amd64.iso | head -n 1 | cut -f 8 -d '"' +/srv/wolfpack +curl -s http://cdimage.kali.org/current/ | grep -m 1 live-amd64.iso | cut -f 4 -d '"' echo http://cdimage.kali.org/current/PREVRESULT diff --git a/roles/WolfPack/files/Yggdrasil/lshows.DarkNet b/roles/WolfPack/files/Yggdrasil/lshows.DarkNet deleted file mode 100644 index f0e2394..0000000 --- a/roles/WolfPack/files/Yggdrasil/lshows.DarkNet +++ /dev/null @@ -1,12 +0,0 @@ -shows -/srv/yggdrasil/new_acquisition -S06E23#2 Broke Girls# -S10E25#Big Bang Theory# -S04E21#The Fosters# -S18E19#Law Order SVU# -S08E23#The Middle# -S08E22#Modern Family# -S07E13#Shameless US -S07E17#The Walking Dead# -S03E25#Scorpion# -S05E05#Prison Break#ettv diff --git a/roles/WolfPack/files/Yggdrasil/mediawiki.pup b/roles/WolfPack/files/Yggdrasil/mediawiki.pup deleted file mode 100644 index 78fdf6a..0000000 --- a/roles/WolfPack/files/Yggdrasil/mediawiki.pup +++ /dev/null @@ -1,4 +0,0 @@ -download -/var/cache/localpkg/ -wget -q -O - https://www.mediawiki.org/wiki/Download | grep 'Download MediaWiki' | cut -f 6 -d \" -echo https:PREVRESULT diff --git a/roles/WolfPack/files/Yggdrasil/plpbt.pup b/roles/WolfPack/files/Yggdrasil/plpbt.pup deleted file mode 100644 index 6a47616..0000000 --- a/roles/WolfPack/files/Yggdrasil/plpbt.pup +++ /dev/null @@ -1,3 +0,0 @@ -download -/usr/local/src/isos/ -wget -q -O - https://www.plop.at/en/bootmanager/download.html | grep 'plpbt-' | head -n 2 | tail -n 1 | cut -f 3 -d '=' | cut -f 1 -d ' ' diff --git a/roles/WolfPack/files/Yggdrasil/putty.pup b/roles/WolfPack/files/Yggdrasil/putty.pup deleted file mode 100644 index d6cd808..0000000 --- a/roles/WolfPack/files/Yggdrasil/putty.pup +++ /dev/null @@ -1,3 +0,0 @@ -download -/srv/wolfpack/ -echo http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe diff --git a/roles/WolfPack/files/Yggdrasil/raspbian.pup b/roles/WolfPack/files/Yggdrasil/raspbian.pup index 476cb55..babb49b 100644 --- a/roles/WolfPack/files/Yggdrasil/raspbian.pup +++ b/roles/WolfPack/files/Yggdrasil/raspbian.pup @@ -1,4 +1,3 @@ download -/usr/local/src/isos/ -wget -q -O - 'https://www.raspberrypi.org/downloads/raspbian/' | grep 'btn dl-zip' | grep -i lite | cut -f 2 -d \" -curl -sI PREVRESULT | grep Location: | cut -f 2 -d ' ' | sed 's/\r//g' +/srv/wolfpack +echo https://downloads.raspberrypi.org/imager/imager_latest.exe diff --git a/roles/WolfPack/files/Yggdrasil/winscp.pup b/roles/WolfPack/files/Yggdrasil/winscp.pup deleted file mode 100644 index abae2f6..0000000 --- a/roles/WolfPack/files/Yggdrasil/winscp.pup +++ /dev/null @@ -1,3 +0,0 @@ -download -/srv/wolfpack/ -wget -q -O - http://portableapps.com/apps/internet/winscp_portable | grep 'sf-download' | cut -f 4 -d \" | head -n 1 diff --git a/roles/WolfPack/tasks/main.yml b/roles/WolfPack/tasks/main.yml index 23f1987..3acff9b 100644 --- a/roles/WolfPack/tasks/main.yml +++ b/roles/WolfPack/tasks/main.yml @@ -3,14 +3,39 @@ - name: Packages become: yes package: + state: present name: - - wolfpack + - WolfPack - - name: Config + - name: File config become: yes - copy: - src: "{{ inventory_hostname }}" + when: "wolfpack_config is not defined" + ansible.posix.synchronize: + src: "{{ inventory_hostname }}/" dest: /usr/local/etc/WolfPack + delete: true + + - name: Git config + become: yes + when: "wolfpack_config is defined" + git: + repo: "{{ wolfpack_config }}" + dest: /usr/local/etc/WolfPack + clone: yes + update: no + + - name: Hardening + become: yes + loop: + - /usr/local/etc/WolfPack + - /srv/wolfpack + file: + path: "{{ item }}" + state: directory + owner: wolfpack + group: wolfpack + mode: 0755 + recurse: true - name: Timer become: yes @@ -19,7 +44,3 @@ state: started enabled: yes daemon_reload: yes - - # TODO Add sshfs and mountpoint for Darknet - # TODO Add config folders and restart daemon on change - # TODO Deprecate offload-wolfpack for Deluge move to sshfs