warding 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61af4b1237c08e8310c900abea7ec87c83690338d9280f8fd1f560b3dd07f289
-  data.tar.gz: bf550f3cee879ea196711c1de7939f8bc388db847707da10e30992cb351c7794
+  metadata.gz: 1336ed9c9428a9d4a863bcff8d1f9e5d9f5c10aac9470b613b77ef1bb582c766
+  data.tar.gz: 10b78d4ceeb9c41b8241b8273b84150baa9c991319f4397ccb1df784d554ac3d
 SHA512:
-  metadata.gz: 209a4dbd18ab2939cde65efe6cf381b5e2064b336747a2f7c197ce508669c0b70a5715ae882767fc52175ef2bc6b82a3c0bd12fddae3b672927fdaccb36f66a3
-  data.tar.gz: 113a0a52a3943836203b3b9959308473c3beec215019a457f3dba64b8293f11fe2dcebe333dea5063a33e19796c567e0f46fd13a4270ce79c56448448018b33c
+  metadata.gz: e9f73200e9ea088e7f1dc5a3b47e84b0b84ed6d6bb4008a16b4cbd48398c59f0262233f4923e42beb97ff0e6f5f0152dfecae9bdd498fbe89d1bfc3663eeda2a
+  data.tar.gz: 2814c6eae1c1f05fab93853b2e39e8bf7c41888bc28759955d13eec06e9536dc75955c17702ba50a52b341a8ea1ebf298a03c4d66c9e77f37d152f7b51e6ca68

data/lib/warding.rb

@@ -89,133 +89,145 @@ module Warding
     def install(data)
       if @@prompt.yes?('Confirm settings and continue?')
 
-        # setup mirrorlist
+        @@prompt.say("Installing, please wait...")
 
-        if data[:update_mirrors]
+        def setup_mirrors
           `reflector --latest 25 --sort rate --save /etc/pacman.d/mirrorlist`
         end
 
-        # setup timezone
+        setup_mirrors if data[:update_mirrors]
 
-        `timedatectl set-ntp true`
-
-        if data[:update_timezone]
-          `timedatectl set-timezone #{data[:update_timezone]}`
-        else
-          `timedatectl set-timezone "$(curl --fail https://ipapi.co/timezone)"`
+        def setup_timezone(timezone)
+          `timedatectl set-ntp true`
+          if timezone
+            `timedatectl set-timezone #{timezone}`
+          else
+            `timedatectl set-timezone "$(curl --fail https://ipapi.co/timezone)"`
+          end
         end
 
-        # setup paritions
-
-        `parted -s -a optimal /dev/sda \
-          mklabel gpt \
-          mkpart primary fat32 0% #{data[:system_settings][:boot_size]}Mib \
-          set 1 esp on \
-          mkpart primary ext4 #{data[:system_settings][:boot_size]}Mib 100% \
-          set 2 lvm on
-        `
-
-        `pvcreate /dev/sda2`
-        `vgcreate vg0 /dev/sda2`
-        `lvcreate -L #{data[:system_settings][:swap_size]}Mib vg0 -n swap`
-        `lvcreate -L #{data[:system_settings[:home_size]]}Mib vg0 -n home` if data[:system_settings][:partition] == '/boot, /root and /home'
-        `lvcreate -l 100%FREE vg0 -n root`
+        data[:update_timezone] ? setup_timezone(data[:update_timezone]) : setup_timezone
 
-        `mkfs.ext4 /dev/vg0/root`
-        `mount /dev/vg0/root /mnt`
-
-        if data[:system_settings][:partition] == '/boot, /root and /home'
-          `mkfs.ext4 /dev/vg0/home`
-          `mount /dev/vg0/home /mnt/home`
+        def setup_partitions(boot_size)
+          `parted -s -a optimal /dev/sda \
+            mklabel gpt \
+            mkpart primary fat32 0% #{boot_size}Mib \
+            set 1 esp on \
+            mkpart primary ext4 #{boot_size}Mib 100% \
+            set 2 lvm on
+          `
         end
 
-        `mkfs.fat -F32 /dev/sda1`
-        `mkdir /mnt/boot`
-
-        `mkswap /dev/vg0/swap`
-        `swapon /dev/vg0/swap`
-
-        # setup encryption
-
-        # TODO: everything
-
-        # setup base packages
-
-        `pacman -Sy`
-        `pacstrap /mnt base base-devel`
-        `genfstab -U /mnt >> /mnt/etc/fstab`
-
-        # setup chroot
-
-        `arch-chroot /mnt ln -sf /usr/share/zoneinfo/"$(curl --fail https://ipapi.co/timezone)" /etc/localtime`
-        `arch-chroot /mnt hwclock --systohc`
-
-        `echo "#{data[:system_language]}.UTF-8" > /mnt/etc/locale.gen`
-        `arch-chroot /mnt locale-gen`
-        `echo "LANG=#{data[:system_language]}.UTF-8" > /mnt/etc/locale.conf`
+        setup_partitions(data[:system_settings][:boot_size])
 
-        `echo KEYMAP=#{data[:keyboard_keymap]} > /mnt/etc/vconsole.conf`
-
-        `echo "warding" > /mnt/etc/hostname`
-
-        `echo "127.0.0.1 localhost
-        ::1 localhost
-        127.0.1.1 warding.localdomain warding" > /mnt/etc/hosts`
-
-        `arch-chroot /mnt echo -e "#{data[:root_password]}\n#{data[:root_password]}" | passwd`
-
-        `arch-chroot /mnt pacman -Sy archlinux-keyring linux lvm2 mkinitcpio --noconfirm`
+        def setup_lvm(scheme, swap_size, home_size=false)
+          `pvcreate /dev/sda2`
+          `vgcreate vg0 /dev/sda2`
+          `lvcreate -L #{swap_size}Mib vg0 -n swap`
+          if scheme == '/boot, /root and /home'
+            `lvcreate -L #{home_size}Mib vg0 -n home`
+          end
+          `lvcreate -l 100%FREE vg0 -n root`
 
-        `sed -i "/^HOOK/s/filesystems/lvm2 filesystems/" /mnt/etc/mkinitcpio.conf`
+          `mkfs.ext4 /dev/vg0/root`
+          `mount /dev/vg0/root /mnt`
 
-        `arch-chroot /mnt mkinitcpio -p linux`
+          if scheme == '/boot, /root and /home'
+            `mkfs.ext4 /dev/vg0/home`
+            `mount /dev/vg0/home /mnt/home`
+          end
 
-        `arch-chroot /mnt pacman -S intel-ucode --noconfirm`
+          `mkfs.fat -F32 /dev/sda1`
+          `mkdir /mnt/boot`
+          `mount /dev/sda1 /mnt/boot`
 
-        # bootloader
+          `mkswap /dev/vg0/swap`
+          `swapon /dev/vg0/swap`
+        end
 
-        if data[:system_settings][:bootloader] == 'systemd-boot'
-          `arch-chroot /mnt bootctl install`
-          `echo "title Warding Linux
-          linux /vmlinuz-linux
-          initrd /intel-ucode.img
-          initrd /initramfs-linux.img
-          options root=/dev/vg0/root rw" > /mnt/boot/loader/entries/warding.conf`
+        if data[:system_settings][:partition] == '/boot, /root and /home'
+          setup_lvm(data[:system_settings][:partition], data[:system_settings][:swap_size], data[:system_settings[:home_size]])
         else
-          # TODO: grub
+          setup_lvm(data[:system_settings][:partition], data[:system_settings][:swap_size])
         end
 
-        # setup default packages
+        # setup encryption
+        # TODO: everything
+
+        def setup_packages
+          `pacman -Sy`
+          `pacstrap /mnt base base-devel`
+          `genfstab -U /mnt >> /mnt/etc/fstab`
+        end
 
-        # TODO: include gnome desktop
-        `arch-chroot /mnt pacman -S make nano fuse wget automake cmake gcc autoconf openbsd-netcat dhcpcd samba openssh openvpn unzip vim xorg-server xf86-video-intel plasma konsole dolphin kmix sddm wget git kvantum-qt5 zsh --noconfirm`
+        def setup_chroot(lang, keymap, password)
+          `arch-chroot /mnt ln -sf /usr/share/zoneinfo/"$(curl --fail https://ipapi.co/timezone)" /etc/localtime`
+          `arch-chroot /mnt hwclock --systohc`
+
+          `echo "#{lang}.UTF-8" > /mnt/etc/locale.gen`
+          `arch-chroot /mnt locale-gen`
+          `echo "LANG=#{lang}.UTF-8" > /mnt/etc/locale.conf`
+          `echo KEYMAP=#{keymap} > /mnt/etc/vconsole.conf`
+          `echo "warding" > /mnt/etc/hostname`
+          `echo "127.0.0.1 localhost
+          ::1 localhost
+          127.0.1.1 warding.localdomain warding" > /mnt/etc/hosts`
+
+          `arch-chroot /mnt echo -e "#{password}\n#{password}" | passwd`
+
+          `arch-chroot /mnt pacman -Sy linux lvm2 mkinitcpio --noconfirm`
+          `sed -i "/^HOOK/s/filesystems/lvm2 filesystems/" /mnt/etc/mkinitcpio.conf`
+          `arch-chroot /mnt mkinitcpio -p linux`
+          `arch-chroot /mnt pacman -S intel-ucode --noconfirm`
+        end
 
-        `arch-chroot /mnt systemctl enable dhcpcd`
-        `arch-chroot /mnt systemctl enable sddm`
+        setup_chroot(data[:system_language], data[:keyboard_keymap], data[:root_password])
+
+        def setup_bootloader(loader)
+          if loader == 'systemd-boot'
+            `arch-chroot /mnt bootctl install`
+            `echo "title Warding Linux
+            linux /vmlinuz-linux
+            initrd /intel-ucode.img
+            initrd /initramfs-linux.img
+            options root=/dev/vg0/root rw" > /mnt/boot/loader/entries/warding.conf`
+          else
+            # TODO: grub
+          end
+        end
 
-        `arch-chroot /mnt wget -qO- https://blackarch.org/strap.sh | sh`
+        setup_bootloader(data[:system_settings][:bootloader])
 
-        `arch-chroot /mnt wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh`
+        def setup_usability
+          # TODO: include gnome desktop
+          `arch-chroot /mnt pacman -S nano fuse wget cmake openbsd-netcat dhcpcd samba openssh openvpn unzip vim xorg-server xf86-video-intel plasma konsole dolphin kmix sddm wget git kvantum-qt5 zsh --noconfirm`
+          `arch-chroot /mnt systemctl enable dhcpcd`
+          `arch-chroot /mnt systemctl enable sddm`
+          `arch-chroot /mnt wget -qO- https://blackarch.org/strap.sh | sh`
+          `arch-chroot /mnt wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh`
+        end
 
-        # setup themes
+        setup_usability
 
-        if data[:extra_settings].include?('themes')
+        def setup_visuals
           `arch-chroot /mnt wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | sh`
           `arch-chroot /mnt wget -qO- https://git.io/papirus-icon-theme-install | sh`
         end
 
-        # setup extra tools
+        setup_visuals if data[:extra_settings].include?('themes')
 
-        if data[:extra_settings].include?('tools')
+        def setup_extras
           `arch-chroot /mnt pacman -S nmap impacket go ruby php firefox atom hashcat john jre-openjdk proxychains-ng exploitdb httpie metasploit bind-tools radare2 sqlmap wpscan xclip --noconfirm`
           `arch-chroot /mnt mkdir -p /usr/share/wordlists`
           `arch-chroot /mnt wget -q https://github.com/danielmiessler/SecLists/raw/master/Passwords/Leaked-Databases/rockyou.txt.tar.gz -O /usr/share/wordlists/rockyou.txt.tar.gz`
           `arch-chroot /mnt wget -q https://github.com/danielmiessler/SecLists/raw/master/Discovery/Web-Content/common.txt -O /usr/share/wordlists/common.txt`
         end
 
-        # setup crons
+        setup_extras if data[:extra_settings].include?('tools')
 
-        # TODO: include crons
+        def setup_cron
+          # TODO: include crons
+        end
       end
     end
   end

data/lib/warding/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Warding
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warding
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marlos Pomin