diff --git a/hugo-site/config.toml b/hugo-site/config.toml index 322ac14..479a9ac 100644 --- a/hugo-site/config.toml +++ b/hugo-site/config.toml @@ -57,3 +57,4 @@ home = [ "HTML", "RSS", "JSON"] twitch = "https://www.twitch.tv/thetridentproject" twitter = "https://twitter.com/TridentProject" telegram = "https://t.me/ProjectTrident" + wiki = "https://github.com/project-trident/trident-docs/wiki" diff --git a/hugo-site/content/_index.md b/hugo-site/content/_index.md index c771e8f..fd936e9 100755 --- a/hugo-site/content/_index.md +++ b/hugo-site/content/_index.md @@ -6,15 +6,16 @@ weight = 5 pre = "" +++ -{{< banner "/images/logo.svg" >}} +{{< banner "/images/banner-horizontal.png" >}} ## What is Project Trident? -Project Trident is a desktop-focused operating system based on [TrueOS](http://trueos.org). It uses the [Lumina desktop](http://lumina-desktop.org) as well as a number of self-developed utilities to provide an easy-to-use system that both BSD beginners and advanced system administrators can feel comfortable running 24/7. +Project Trident is a desktop-focused operating system based on [Void Linux](http://voidlinux.org). It uses the [Lumina desktop](http://lumina-desktop.org) as well as a number of self-developed utilities to provide an easy-to-use system that both beginners and advanced system administrators can feel comfortable running 24/7. ### Benefits of Project Trident * ***Privacy:*** No advertisements. No tracking. No reporting of "metrics" on your computer activity. +* ***Encryption:*** All user data is encrypted by default. Keep your information safe! * ***No Cost:*** [sponsorships](/sponsors) gladly accepted but not required. -* ***Regular Updates:*** Weekly updates for all 3rd-party packages and updates to the base OS every 6 months. +* ***Regular Updates:*** The Void repositories are updated *daily*. * ***Always ready:*** No need to wait for OS or application updates before using your system. Perform updates only when *you* are ready. * ***Stable:*** Keep it running all day, every day, without loss of performance. * ***Open-source:*** All the source code for Project Trident is [freely available on GitHub](https://github.com/project-trident) for audit and enhancement by anyone. diff --git a/hugo-site/content/download/_index.md b/hugo-site/content/download/_index.md index dcaceea..a048f70 100755 --- a/hugo-site/content/download/_index.md +++ b/hugo-site/content/download/_index.md @@ -17,11 +17,10 @@ pre: " " |Virtualization| VMWare, bhyve | VirtualBox | -{{< download2 "https://project-trident.org/void/" "Void Linux ALPHA" "https://project-trident.org:40001/void/manifest.json" >}} -For details about what this ALPHA image provides, please see [the announcement](/post/void-alpha-available/). +{{< download2 "https://raw.githubusercontent.com/project-trident/trident-website/master/hugo-site/static/iso-manifests/" "Void Linux BETA" >}} +For details about what this BETA image provides, please see [the announcement](/post/void-beta-available/). -{{< downloads "https://pkg.project-trident.org/iso/stable/" "[EOL: Jan 2020] Latest STABLE" >}} -{{< downloads "https://pkg.project-trident.org/iso/release/" "[Deprecated Oct 2019] Last CURRENT" >}} +{{< downloads "https://pkg.project-trident.org/iso/stable/" "[Deprecated Jan 2020] Last FreeBSD STABLE" >}} ## Differences Between Versions | Version | Repository Name | OS | OS Branch | Package Updates | Notes | diff --git a/hugo-site/content/post/void-beta-available.md b/hugo-site/content/post/void-beta-available.md new file mode 100644 index 0000000..68e62f6 --- /dev/null +++ b/hugo-site/content/post/void-beta-available.md @@ -0,0 +1,85 @@ ++++ +title = "Void Linux Beta Image Available" +menutitle = "[BETA] Void Download Available" +description = "A beta-quality image of Void Linux is now available for testing." +date = "2020-01-06" +draft = false +pre = " " ++++ + + +Project Trident is pleased to announce a new Beta-quality image based on Void Linux, available on the [Project Trident download page](/download). + +We have also converted our Trident "docs" repository over to a wiki-based system. This will be the central location for all information related to the Void Linux system setup and configuration. +Please feel free to help expand this wiki while you are using the BETA image! + +[Trident-Docs Wiki](https://github.com/project-trident/trident-docs/wiki) + + +## What is new since the ALPHA image? + +* Boot Environment support for fully-separate datasets and snapshot rollback for boot environments. + * This is provided by the new [zfsbootmenu utility](https://github.com/zdykstra/zfsbootmenu) created by Zack Dykstra. It is only configured for EFI-based bootloader support. Legacy-boot systems cannot use boot environments at the present time. +* User accounts. + * A single user account is created at installation. + * For EFI-booted systems, this user home directory *is encrypted*. It is configured so that logging in to the user account also decrypts the dataset for that user. Logging out locks the user dataset. + * Encrypted datasets are NOT supported on legacy-boot systems. Encrypting any ZFS datasets breaks the ability for GRUB to support booting the zfs pool. + * A new "trident-mkuser" utility has been created for making additional user accounts. This utility supports creating encrypted home directories and will be included later as part of the "trident-core" package. +* Installer changes... lots of them. + * The network status detection routine has been overhauled and now works on networks that block "ping". + * Installation status is now properly detected (fail/success) with a menu option to browse the log file if one is available. + * For EFI installs, rebooting after completing the installation automatically ignores the ISO and boots the installed system. This allows more time to remove the ISO install device after the real system is already running. + * The installation logfile is copied over to the newly-installed system, to */var/log/trident-install.log*. + * To maintain a BSD-style system layout, the "home" dataset is mounted at */usr/home*, and */home* is a symlink to */usr/home*. + * The ZFS pool layout has been tweaked a bit after testing boot environment functionality. + * Additional input checking has been integrated into the installer to help ensure successful installs. + * The installer provides four different "levels" of installation. This governs which packages get installed and configured: + * **Void** : Only the base-system from Void Linux and ZFS-related bootloader packages are installed. + * **Server** : A CLI-based system with additional services and utilities installed from Project Trident (firewall, cron, autofs, wireguard, additional shells, etc.) + * **Lite Desktop** : (Experimental) A minimal desktop installation with the Lumina desktop. + * **Full Desktop** : (Experimental) A Lumina desktop install with additional end-user utilities (office suite, Telegram, multimedia apps, etc). + * Note that installation levels provide pre-defined lists of packages to install for user convenience. The installed system can be easily be changed using the built-in package system. + +## I installed the ALPHA, should I reinstall for the BETA? +Yes. There have been many changes to boot setup and dataset organization since the ALPHA image. These changes are difficult to make without a full reinstall. + +The base system layout and bootloader setup have been very stable, so we do not anticipate a re-installation requirement between BETA and RELEASE. At present, all that will be required is manually installing a few packages when they are available in the Void Linux repositories. + +## What does this image provide? +* A full "ZFS-on-root" installation of Void Linux. +* A full walkthrough of the installation procedure in an easy-to-use fashion. No experience with disk formatting or partitioning is required. +* Hybrid EFI and BIOS-boot capabilities. Both for the ISO and for the system post-install. + * EFI booting is **required** for boot environment and dataset encryption support with *zfsbootmenu*. + * *rEFInd* and *zfsbootmenu* are used for EFI boot support. + * GRUB is used for Legacy booting, but does not currently support boot environments or ZFS encryption. +* Encrypted SWAP on ZFS, when swap space is selected. +* Support for both "glibc" and "musl" versions of Void packages in a single installer. +* Support for detecting and connecting to wireless networks in an easy-to-use series of prompts (DHCP only). These settings get transferred over to the new installation for out-of-box network support. +* Due to the constant flow of updates to the Void Linux package repositories, this image is a complete "net-install" implementation. This means that all installed packages are always the current version from the repository and the system is fully up-to-date after the install is complete. +* Boot Environment support for fully-separate datasets and snapshot rollback for boot environments. + * This is enabled with the new [zfsbootmenu utility](https://github.com/zdykstra/zfsbootmenu) created by Zack Dykstra. + * Boot environment support is currently **only** available for EFI-booted systems. +* User accounts. + * Each user account gets a separate ZFS dataset for their home directory. This is configured so the individual user can perform snapshot-related tasks on their own files without needing root permissions. + * EFI-boot: Each user dataset *is* encrypted. This dataset is automatically locked/unlocked based on user login. + * Legacy-boot: Each user homedir is *not* encrypted. + +## What does this image NOT provide? + +* Graphical Desktop Setup. + * We install the current lumina desktop package from Void by default, and a collection of other desktop packages, but none of the Trident utilities are ported or installed yet. + * Quick Hint: After logging in with the terminal, run `start-lumina-desktop` to launch a graphical desktop session. The current Lumina package for Void is unconfigured, so you will need to manually setup application shortcuts and change the theme settings. +* Partition support or multi-boot capabilities. + * WARNING: This installer expects that a single, dedicated hard disk is provided for the installation. The installer will wipe and re-provision that entire disk, deleting any data stored on the disk. + +## Important notes + +1. Due to how ZFS is packaged on Linux, a dynamic kernel module is automatically compiled for your specific system during the package installation. This may take a little while to complete, depending on your system hardware capabilities. +2. From our initial testing, the average time to perform the installation is about 30 minutes. This will vary depending on download speeds and compilation time of the DKMS modules. +3. The default shell for Void Linux is "dash" and is the "/bin/sh" of the system. + * It might be helpful to run `chsh` after logging in to change the default login shell, as dash is very limited. + * In shell scripts, make sure to use "#!/bin/bash" instead of "#!/bin/sh", otherwise you may experience odd script failures due to using "dash" instead of the traditional "Bourne shell". +4. The user password must be a minimum of 8 characters due to the ZFS encryption key length requirement. Modifying a user password to be less than 8 characters later on will break the user account! + +## Looking ahead +The next step is finalizing all of the desktop/graphics initialization routines and pushing the trident-core and trident-desktop packages up to Void Linux, including any additional desktop-related packages that we might need. We are running a little bit behind our original timetable, but are still aiming to release the desktop-focused "RELEASE" version of PT based on Void Linux by the end of the month. diff --git a/hugo-site/layouts/partials/logo.html b/hugo-site/layouts/partials/logo.html index 99bae6a..f123534 100644 --- a/hugo-site/layouts/partials/logo.html +++ b/hugo-site/layouts/partials/logo.html @@ -1,3 +1,3 @@ diff --git a/hugo-site/layouts/partials/menu-footer.html b/hugo-site/layouts/partials/menu-footer.html index c24690c..5ebf8e7 100644 --- a/hugo-site/layouts/partials/menu-footer.html +++ b/hugo-site/layouts/partials/menu-footer.html @@ -1,11 +1,12 @@

Media Platforms

diff --git a/hugo-site/layouts/shortcodes/download2.html b/hugo-site/layouts/shortcodes/download2.html index a2c8868..7ff48b6 100644 --- a/hugo-site/layouts/shortcodes/download2.html +++ b/hugo-site/layouts/shortcodes/download2.html @@ -1,9 +1,8 @@ {{ $baseurl := (.Get 0) }} {{ $release_type := (.Get 1) }} -{{ $manifest := (.Get 2) }} -{{ $data := getJSON (print $manifest) }} +{{ $data := getJSON (print $baseurl "manifest.json") }} - {{ $iso_url := print $baseurl $data.iso_file }} + {{ $iso_url := print "https://project-trident.org/void/" $data.iso_file }} {{ $sig_url := print $baseurl $data.signature_file }} {{ $pubkey_url := print $baseurl "pubkey.pem" }} {{ $checksum_url := print $baseurl $data.md5_file }} diff --git a/hugo-site/static/images/banner-horizontal.png b/hugo-site/static/images/banner-horizontal.png new file mode 100644 index 0000000..1ceeb02 Binary files /dev/null and b/hugo-site/static/images/banner-horizontal.png differ diff --git a/hugo-site/static/images/logo.png b/hugo-site/static/images/logo.png new file mode 100644 index 0000000..1b0894c Binary files /dev/null and b/hugo-site/static/images/logo.png differ diff --git a/hugo-site/static/images/logo.svg b/hugo-site/static/images/logo.svg deleted file mode 100755 index c14e952..0000000 --- a/hugo-site/static/images/logo.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5 new file mode 100644 index 0000000..ca10385 --- /dev/null +++ b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5 @@ -0,0 +1 @@ +MD5 (/usr/home/kenmoore/Projects/trident-website/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso) = 2d5b1d17b64d108d64ea5523d98ea73e diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256 new file mode 100644 index 0000000..287f754 --- /dev/null +++ b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256 @@ -0,0 +1 @@ +SHA256 (/usr/home/kenmoore/Projects/trident-website/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso) = cfe2f7b6dbbd818dd4264413c390d726b770a4fb4b8aef20dc194e130d079941 diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512 new file mode 100644 index 0000000..a4646df Binary files /dev/null and b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512 differ diff --git a/hugo-site/static/iso-manifests/manifest.json b/hugo-site/static/iso-manifests/manifest.json new file mode 100644 index 0000000..9c99c67 --- /dev/null +++ b/hugo-site/static/iso-manifests/manifest.json @@ -0,0 +1,13 @@ +{ +"iso_file" : "Trident-BETA-netinstall-x86_64.iso", +"iso_size" : "515M", +"signature_file" : "Trident-BETA-netinstall-x86_64.iso.sig.sha512", +"md5_file" : "Trident-BETA-netinstall-x86_64.iso.md5", +"md5" : "2d5b1d17b64d108d64ea5523d98ea73e", +"sha256_file" : "Trident-BETA-netinstall-x86_64.iso.sha256", +"sha256" : "cfe2f7b6dbbd818dd4264413c390d726b770a4fb4b8aef20dc194e130d079941", +"build_date" : "Jan 06, 2020", +"build_date_time_t" : "1578320534", +"version" : "Void-BETA" +} +