diff options
| -rw-r--r-- | nginx/nginx.conf | 10 | ||||
| -rw-r--r-- | static/404.html | 2 | ||||
| -rw-r--r-- | static/articles/grapheneos-servers.html | 2 | ||||
| -rw-r--r-- | static/articles/index.html | 4 | ||||
| -rw-r--r-- | static/articles/server-traffic-shaping.html | 2 | ||||
| -rw-r--r-- | static/articles/sitewide-advertising-industry-opt-out.html | 2 | ||||
| -rw-r--r-- | static/build.html | 4 | ||||
| -rw-r--r-- | static/contact.html | 2 | ||||
| -rw-r--r-- | static/donate.html | 2 | ||||
| -rw-r--r-- | static/faq.html | 11 | ||||
| -rw-r--r-- | static/features.html | 2 | ||||
| -rw-r--r-- | static/index.html | 4 | ||||
| -rw-r--r-- | static/install/cli.html (renamed from static/install.html) | 10 | ||||
| -rw-r--r-- | static/install/index.html | 71 | ||||
| -rw-r--r-- | static/install/web.html (renamed from static/web-install.html) | 14 | ||||
| -rw-r--r-- | static/pdfviewer-privacy-policy.html | 2 | ||||
| -rw-r--r-- | static/releases.html | 4 | ||||
| -rw-r--r-- | static/sitemap.xml | 10 | ||||
| -rw-r--r-- | static/source.html | 2 | ||||
| -rw-r--r-- | static/usage.html | 2 |
20 files changed, 123 insertions, 39 deletions
diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 94216327..8a05391d 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -150,6 +150,14 @@ http { return 301 /install; } + location = /install { + return 301 /install/cli; + } + + location = /web-install { + return 301 /install/web; + } + location = /LICENSE { return 301 /LICENSE.txt; } @@ -223,7 +231,7 @@ http { internal; } - location = /web-install { + location = /install/web { include /etc/nginx/snippets/security-headers-base.conf; add_header Content-Security-Policy "default-src 'none'; connect-src 'self' https://releases.grapheneos.org/; font-src 'self'; img-src 'self'; manifest-src 'self'; script-src 'self'; style-src 'self'; form-action 'none'; frame-ancestors 'none'; block-all-mixed-content; base-uri 'none'" always; add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), xr-spatial-tracking=()" always; diff --git a/static/404.html b/static/404.html index d08de305..ba9adb61 100644 --- a/static/404.html +++ b/static/404.html @@ -31,7 +31,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/articles/grapheneos-servers.html b/static/articles/grapheneos-servers.html index a8ebd2be..fb305a26 100644 --- a/static/articles/grapheneos-servers.html +++ b/static/articles/grapheneos-servers.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/articles/index.html b/static/articles/index.html index fb5c7d69..829c9bc6 100644 --- a/static/articles/index.html +++ b/static/articles/index.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> @@ -52,7 +52,7 @@ <ul> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/articles/server-traffic-shaping.html b/static/articles/server-traffic-shaping.html index b19683ff..e03723df 100644 --- a/static/articles/server-traffic-shaping.html +++ b/static/articles/server-traffic-shaping.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/articles/sitewide-advertising-industry-opt-out.html b/static/articles/sitewide-advertising-industry-opt-out.html index e6942452..91e87bec 100644 --- a/static/articles/sitewide-advertising-industry-opt-out.html +++ b/static/articles/sitewide-advertising-industry-opt-out.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/build.html b/static/build.html index c92d57e5..c65834af 100644 --- a/static/build.html +++ b/static/build.html @@ -34,7 +34,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li aria-current="page"><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> @@ -655,7 +655,7 @@ cd ../..</pre> incremental updates from those to the most recent signed <code>target_files</code> zip.</p> - <p>See the <a href="/install">install guide</a> for information on how to use the + <p>See the <a href="/install/">install page</a> for information on how to use the factory images. See the <a href="/usage#updates-sideloading">usage guide section on sideloading updates</a> for information on how to use the update packages.</p> diff --git a/static/contact.html b/static/contact.html index dd0eb5c5..ddb29653 100644 --- a/static/contact.html +++ b/static/contact.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/donate.html b/static/donate.html index eb9bf822..cade4424 100644 --- a/static/donate.html +++ b/static/donate.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/faq.html b/static/faq.html index 298b07b2..c8b4d632 100644 --- a/static/faq.html +++ b/static/faq.html @@ -34,7 +34,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li aria-current="page"><a href="/faq">FAQ</a></li> @@ -1106,10 +1106,11 @@ <article id="install"> <h2><a href="#install">How do I install GrapheneOS?</a></h2> - <p>Follow the <a href="/install">official GrapheneOS installation guide</a>. Third - party installation guides tend to be out-of-date and often contain misguided - advice and errors. If you have trouble with the installation process, ask for help - from the <a href="/contact#community">#grapheneos Matrix / IRC channel</a>.</p> + <p>Either follow the <a href="/install/cli">official command-line installation + guide</a> or use <a href="/install-web">our web-based installer</a>. Third party + installation guides tend to be out-of-date and often contain misguided advice and + errors. If you have trouble with the installation process, ask for help from the + <a href="/contact#community">#grapheneos Matrix / IRC channel</a>.</p> </article> <article id="build"> diff --git a/static/features.html b/static/features.html index 56087136..5bd85659 100644 --- a/static/features.html +++ b/static/features.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li aria-current="page"><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/index.html b/static/index.html index f8632226..c5ed6d91 100644 --- a/static/index.html +++ b/static/index.html @@ -34,7 +34,7 @@ <ul> <li aria-current="page"><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> @@ -79,7 +79,7 @@ Project.</p> <p>Official releases are available on the <a href="/releases">releases page</a> and - installation instructions are on the <a href="/install">install page</a>.</p> + installation instructions are on the <a href="/install/">install page</a>.</p> <section id="never-google-services"> <h2><a href="#never-google-services">No Google apps or services</a></h2> diff --git a/static/install.html b/static/install/cli.html index 347cba27..134ecc3c 100644 --- a/static/install.html +++ b/static/install/cli.html @@ -3,22 +3,22 @@ <head> <meta charset="utf-8"/> <title>Install | GrapheneOS</title> - <meta name="description" content="Installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> + <meta name="description" content="Command-line installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> <meta name="theme-color" content="#212121"/> <meta name="msapplication-TileColor" content="#ffffff"/> <meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="twitter:site" content="@GrapheneOS"/> <meta name="twitter:creator" content="@GrapheneOS"/> <meta property="og:title" content="GrapheneOS install documentation"/> - <meta property="og:description" content="Installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> + <meta property="og:description" content="Command-line installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> <meta property="og:type" content="website"/> <meta property="og:image" content="https://grapheneos.org/opengraph.png"/> <meta property="og:image:width" content="512"/> <meta property="og:image:height" content="512"/> <meta property="og:image:alt" content="GrapheneOS logo"/> <meta property="og:site_name" content="GrapheneOS"/> - <meta property="og:url" content="https://grapheneos.org/install"/> - <link rel="canonical" href="https://grapheneos.org/install"/> + <meta property="og:url" content="https://grapheneos.org/install/cli"/> + <link rel="canonical" href="https://grapheneos.org/install/cli"/> <link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" type="image/vnd.microsoft.icon" href="/favicon.ico"/> <link rel="icon" sizes="any" type="image/svg+xml" href="/mask-icon.svg"/> <link rel="mask-icon" href="/mask-icon.svg" color="#1a1a1a"/> @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li aria-current="page"><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/install/index.html b/static/install/index.html new file mode 100644 index 00000000..430eeae8 --- /dev/null +++ b/static/install/index.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> +<html lang="en" prefix="og: https://ogp.me/ns#"> + <head> + <meta charset="utf-8"/> + <title>Install | GrapheneOS</title> + <meta name="description" content="Installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> + <meta name="theme-color" content="#212121"/> + <meta name="msapplication-TileColor" content="#ffffff"/> + <meta name="viewport" content="width=device-width, initial-scale=1"/> + <meta name="twitter:site" content="@GrapheneOS"/> + <meta name="twitter:creator" content="@GrapheneOS"/> + <meta property="og:title" content="GrapheneOS install documentation"/> + <meta property="og:description" content="Installation instructions for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> + <meta property="og:type" content="website"/> + <meta property="og:image" content="https://grapheneos.org/opengraph.png"/> + <meta property="og:image:width" content="512"/> + <meta property="og:image:height" content="512"/> + <meta property="og:image:alt" content="GrapheneOS logo"/> + <meta property="og:site_name" content="GrapheneOS"/> + <meta property="og:url" content="https://grapheneos.org/install/"/> + <link rel="canonical" href="https://grapheneos.org/install/"/> + <link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" type="image/vnd.microsoft.icon" href="/favicon.ico"/> + <link rel="icon" sizes="any" type="image/svg+xml" href="/mask-icon.svg"/> + <link rel="mask-icon" href="/mask-icon.svg" color="#1a1a1a"/> + <link rel="apple-touch-icon" href="/apple-touch-icon.png"/> + <link rel="stylesheet" href="/grapheneos.css?29"/> + <link rel="manifest" href="/manifest.webmanifest"/> + <link rel="license" href="/LICENSE.txt"/> + </head> + <body> + <header> + <nav id="site-menu"> + <ul> + <li><a href="/">GrapheneOS</a></li> + <li><a href="/features">Features</a></li> + <li aria-current="page"><a href="/install/">Install</a></li> + <li><a href="/build">Build</a></li> + <li><a href="/usage">Usage</a></li> + <li><a href="/faq">FAQ</a></li> + <li><a href="/releases">Releases</a></li> + <li><a href="/source">Source</a></li> + <li><a href="/articles/">Articles</a></li> + <li><a href="/donate">Donate</a></li> + <li><a href="/contact">Contact</a></li> + </ul> + </nav> + </header> + <main id="install"> + <h1><a href="#install">Install</a></h1> + + <p>GrapheneOS has two officially supported installation methods. You can either use + the <a href="/install/cli">command-line installation guide</a> or the experimental + <a href="/install/web">WebUSB-based installer</a>.</p> + + <p>The command-line approach offers a way to install GrapheneOS without trusting our + server infrastructure. This requires being on an OS with proper fastboot and signify + packages along with understanding the process enough to avoid blindly trusting the + instructions from our site. For most users, the web-based installation approach is no + less secure and avoids needing any software beyond a browser with WebUSB support.</p> + </main> + <footer> + <a href="/"><img src="/logo.png" width="512" height="512" alt=""/>GrapheneOS</a> + <ul id="social"> + <li><a href="https://twitter.com/GrapheneOS">Twitter</a></li> + <li><a href="https://github.com/GrapheneOS">GitHub</a></li> + <li><a href="https://reddit.com/r/GrapheneOS">Reddit</a></li> + <li><a href="https://www.linkedin.com/company/grapheneos/">LinkedIn</a></li> + </ul> + </footer> + </body> +</html> diff --git a/static/web-install.html b/static/install/web.html index e3058c80..114ae719 100644 --- a/static/web-install.html +++ b/static/install/web.html @@ -3,22 +3,22 @@ <head> <meta charset="utf-8"/> <title>Web install | GrapheneOS</title> - <meta name="description" content="Web-based installer for GrapheneOS"/> + <meta name="description" content="Web-based installer for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> <meta name="theme-color" content="#212121"/> <meta name="msapplication-TileColor" content="#ffffff"/> <meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="twitter:site" content="@GrapheneOS"/> <meta name="twitter:creator" content="@GrapheneOS"/> <meta property="og:title" content="GrapheneOS web install"/> - <meta property="og:description" content="Web-based installer for GrapheneOS"/> + <meta property="og:description" content="Web-based installer for GrapheneOS, a security and privacy focused mobile OS with Android app compatibility."/> <meta property="og:type" content="website"/> <meta property="og:image" content="https://grapheneos.org/opengraph.png"/> <meta property="og:image:width" content="512"/> <meta property="og:image:height" content="512"/> <meta property="og:image:alt" content="GrapheneOS logo"/> <meta property="og:site_name" content="GrapheneOS"/> - <meta property="og:url" content="https://grapheneos.org/web-install"/> - <link rel="canonical" href="https://grapheneos.org/web-install"/> + <meta property="og:url" content="https://grapheneos.org/install/web"/> + <link rel="canonical" href="https://grapheneos.org/install/web"/> <link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" type="image/vnd.microsoft.icon" href="/favicon.ico"/> <link rel="icon" sizes="any" type="image/svg+xml" href="/mask-icon.svg"/> <link rel="mask-icon" href="/mask-icon.svg" color="#1a1a1a"/> @@ -35,7 +35,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> @@ -50,8 +50,8 @@ <main id="web-install"> <h1><a href="#web-install">Web install</a></h1> - <p><strong>This is a highly experimental WebUSB-based installer for GrapheneOS. Use it - at your own risk. Use the <a href="/install">official install guide</a> until this has + <p><strong>This is an experimental WebUSB-based installer for GrapheneOS. Consider + using the <a href="/install/cli">command-line installation guide</a> until this has been more thoroughly tested and improved.</strong></p> <section id="prerequisites"> diff --git a/static/pdfviewer-privacy-policy.html b/static/pdfviewer-privacy-policy.html index 39405165..98aecba8 100644 --- a/static/pdfviewer-privacy-policy.html +++ b/static/pdfviewer-privacy-policy.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/releases.html b/static/releases.html index 779f6c70..06d174c8 100644 --- a/static/releases.html +++ b/static/releases.html @@ -36,7 +36,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> @@ -152,7 +152,7 @@ official builds.</p> <p>The factory images are used for the initial installation and can be verified with - signify. See the <a href="/install">installation guide</a> for details.</p> + signify. See the <a href="/install/">installation page</a> for details.</p> <p>GrapheneOS uses automatic over-the-air updates, but full update packages are listed below for uncommon use cases like never connecting the device to the internet. A full diff --git a/static/sitemap.xml b/static/sitemap.xml index f36d8b0d..4a105a01 100644 --- a/static/sitemap.xml +++ b/static/sitemap.xml @@ -11,12 +11,16 @@ <priority>1.0</priority> </url> <url> - <loc>https://grapheneos.org/install</loc> + <loc>https://grapheneos.org/install/</loc> + <priority>0.1</priority> + </url> + <url> + <loc>https://grapheneos.org/install/cli</loc> <priority>0.5</priority> </url> <url> - <loc>https://grapheneos.org/web-install</loc> - <priority>0.1</priority> + <loc>https://grapheneos.org/install/web</loc> + <priority>0.5</priority> </url> <url> <loc>https://grapheneos.org/build</loc> diff --git a/static/source.html b/static/source.html index 5a6d701c..c5230da9 100644 --- a/static/source.html +++ b/static/source.html @@ -33,7 +33,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> diff --git a/static/usage.html b/static/usage.html index af9becd3..13564d42 100644 --- a/static/usage.html +++ b/static/usage.html @@ -34,7 +34,7 @@ <ul> <li><a href="/">GrapheneOS</a></li> <li><a href="/features">Features</a></li> - <li><a href="/install">Install</a></li> + <li><a href="/install/">Install</a></li> <li><a href="/build">Build</a></li> <li aria-current="page"><a href="/usage">Usage</a></li> <li><a href="/faq">FAQ</a></li> |
