Update the downloads page to include more alternates (#286)

Author: directionless

src/data/pages/downloads.json

@@ -11,37 +11,69 @@
       "sectionHeading": "Alternative Installation Options",
       "subheadings": {
         "darwin": {
-          "subSection1Heading": "Install darwin repository",
-          "subSection1Paragraph1": "osquery can be installed from the Homebrew Cask repository.",
-          "terminalCommands": [
-            "brew install --cask osquery"
+          "sections": [
+            {
+              "heading": "Install darwin repository",
+              "paragraph": "osquery can be installed from the Homebrew Cask repository",
+              "terminalCommands": [
+                "brew install --cask osquery"
+              ]
+            }
           ]
         },
         "ubuntu": {
-          "subSection1Heading": "Install apt repository",
-          "subSection1Paragraph1": "We publish osquery to an apt repository. The DEBs have extremely few dependencies and should work on *most* x86_64 Linux operating systems.",
-          "terminalCommands": [
-            "sudo mkdir -p /etc/apt/keyrings",
-            "curl -L https://pkg.osquery.io/deb/pubkey.gpg | sudo tee /etc/apt/keyrings/osquery.asc",
-            "sudo add-apt-repository 'deb [arch=amd64 signed-by=/etc/apt/keyrings/osquery.asc] https://pkg.osquery.io/deb deb main'",
-            "sudo apt install osquery"
+          "sections": [
+            {
+              "heading": "Install apt repository (22.04 and later)",
+              "paragraph": "We publish osquery to an apt repository. The DEBs have extremely few dependencies and should work on *most* x86_64 Linux operating systems.",
+              "terminalCommands": [
+                "sudo mkdir -p /etc/apt/keyrings",
+                "curl -L https://pkg.osquery.io/deb/pubkey.gpg | sudo tee /etc/apt/keyrings/osquery.asc",
+                "sudo add-apt-repository 'deb [arch=amd64 signed-by=/etc/apt/keyrings/osquery.asc] https://pkg.osquery.io/deb deb main'",
+                "sudo apt install osquery"
+              ]
+            },
+            {
+              "heading": "Install apt repository (Prior to 22.04)",
+              "paragraph": "This uses apt-key",
+              "terminalCommands": [
+                "export OSQUERY_KEY=1484120AC4E9F8A1A577AEEE97A80C63C9D8B80B",
+                "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $OSQUERY_KEY",
+                "sudo add-apt-repository 'deb [arch=amd64] https://pkg.osquery.io/deb deb main'",
+                "sudo apt-get update",
+                "sudo apt-get install osquery"
+              ]
+            }
           ]
         },
         "centos": {
-          "subSection1Heading": "Install yum repository",
-          "subSection1Paragraph1": "We publish osquery to a yum repository. The RPMs have extremely few dependencies and should work on *most* x86_64 Linux operating systems. You may install the \"auto-repo-add\" RPM or add the repository target.",
-          "terminalCommands": [
-            "curl -L https://pkg.osquery.io/rpm/GPG | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-osquery",
-            "sudo yum-config-manager --add-repo https://pkg.osquery.io/rpm/osquery-s3-rpm.repo",
-            "sudo yum-config-manager --enable osquery-s3-rpm-repo",
-            "sudo yum install osquery"
+          "sections": [
+            {
+              "heading": "Install yum repository",
+              "paragraph": "We publish osquery to a yum repository. The RPMs have extremely few dependencies and should work on *most* x86_64 Linux operating systems. You may install the \"auto-repo-add\" RPM or add the repository target.",
+              "terminalCommands": [
+                "curl -L https://pkg.osquery.io/rpm/GPG | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-osquery",
+                "sudo yum-config-manager --add-repo https://pkg.osquery.io/rpm/osquery-s3-rpm.repo",
+                "sudo yum-config-manager --enable osquery-s3-rpm-repo",
+                "sudo yum install osquery"
+              ]
+            }
           ]
         },
         "windows": {
-          "subSection1Heading": "Install windows repository",
-          "subSection1Paragraph1": "We recommend installing and deploying Windows support using chocolatey. Please let us know if your enterprise could make use of other package formats.",
-          "terminalCommands": [
-            "choco install osquery"
+          "sections": [
+            {
+              "heading": "arm64/aarch64 windows support",
+              "paragraph": "Though there is not currently an msi install available, you can find the windows arm64 build on the GitHub releases page (https://github.com/osquery/osquery/releases)",
+              "terminalCommands": []
+            },
+            {
+              "heading": "Additional Install windows repository",
+              "paragraph": "We recommend installing and deploying Windows support using chocolatey. Please let us know if your enterprise could make use of other package formats.",
+              "terminalCommands": [
+                "choco install osquery"
+              ]
+            }
           ]
         }
       }

src/pages/Downloads/Downloads.js

@@ -22,17 +22,17 @@ const OFFICIAL = 'official'
 
 const baseClass = 'downloads-page'
 const installOptionNames = {
+  windows: 'Windows',
   darwin: 'macOS',
   ubuntu: 'Debian Linux',
   centos: 'RPM Linux',
-  windows: 'Windows',
 }
 const installOptionNamesKeys = keys(installOptionNames)
 const installOptionNamesValues = values(installOptionNames)
 
 class Downloads extends Component {
   state = {
-    selectedInstallOption: 'darwin',
+    selectedInstallOption: 'windows',
   }
 
   onInstallOptionChange = installOption => {
@@ -155,24 +155,28 @@ class Downloads extends Component {
             name={selectedInstallOption}
           />
 
-          <div>
-            <Heading5>{alternativeInstallOptionContent.subSection1Heading}</Heading5>
-
-            <Paragraph>{alternativeInstallOptionContent.subSection1Paragraph1}</Paragraph>
-          </div>
-
-          <Terminal.Wrapper className={`${baseClass}__terminal`}>
-            <Terminal.Body className={`${baseClass}__terminal-body`}>
-              {alternativeInstallOptionContent.terminalCommands.map((terminalCommand, idx) => {
-                return (
-                  <Monospace key={`terminal-command-${idx}`}>
-                    <label className="unselectable">$</label> {terminalCommand}
-                    <br />
-                  </Monospace>
-                )
-              })}
-            </Terminal.Body>
-          </Terminal.Wrapper>
+          {alternativeInstallOptionContent.sections.map((sec, idx) => {
+            return (
+              <div>
+                <Heading5>{sec.heading}</Heading5>
+                <Paragraph>{sec.paragraph}</Paragraph>
+                {sec.terminalCommands.length > 0 && (
+                  <Terminal.Wrapper className={`${baseClass}__terminal`}>
+                    <Terminal.Body className={`${baseClass}__terminal-body`}>
+                      {sec.terminalCommands.map((terminalCommand, idx) => {
+                        return (
+                          <Monospace key={`terminal-command-${idx}`}>
+                            <label className="unselectable">$</label> {terminalCommand}
+                            <br />
+                          </Monospace>
+                        )
+                      })}
+                    </Terminal.Body>
+                  </Terminal.Wrapper>
+                )}
+              </div>
+            )
+          })}
         </section>
       </div>
     )