Merge branch 'main' into testtimes

kylecarbs · kylecarbs · commit cea630b095fd · 2022-06-16T14:34:58.000Z
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
@@ -1,4 +1,4 @@
 # Security Policy
 
-Keeping your code secure is central to what we do. If you find a vulnerability,
-please send an email to security@coder.com.
+If you find a vulnerability, **DO NOT FILE AN ISSUE**.
+Instead, send an email to security@coder.com.
diff --git a/docs/install.md b/docs/install.md
@@ -1,29 +1,21 @@
 # Install
 
-This article walks you through the various ways of installing and deploying Coder.
-
 ## install.sh
 
-The easiest way to install Coder is to use our [install script](https://github.com/coder/coder/blob/main/install.sh) for Linux and macOS. The install script
-attempts to use the system package manager detection-reference if possible.
+The easiest way to install Coder is to use our [install script](https://github.com/coder/coder/blob/main/install.sh) for Linux and macOS.
 
-You can preview what occurs during the install process:
+To install, run:
 
 ```bash
-curl -L https://coder.com/install.sh | sh -s -- --dry-run
+curl -L https://coder.com/install.sh | sh
 ```
 
-To install, run:
+You can preview what occurs during the install process:
 
 ```bash
-curl -L https://coder.com/install.sh | sh
+curl -L https://coder.com/install.sh | sh -s -- --dry-run
 ```
 
-> If you're concerned about the install script's use of `curl | sh` and the
-> security implications, please see [this blog
-> post](https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install)
-> by [sandstorm.io](https://sandstorm.io).
-
 You can modify the installation process by including flags. Run the help command for reference:
 
 ```bash
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -43,7 +43,7 @@
           "path": "./CODE_OF_CONDUCT.md"
         },
         {
-          "title": "Security policy",
+          "title": "Security",
           "description": "How to report vulnerabilities in Coder",
           "path": "./SECURITY.md"
         }
diff --git a/install.sh b/install.sh
@@ -112,11 +112,15 @@ $1 package has been installed.
 To run Coder as a system service:
 
   # Set up an external access URL or enable CODER_TUNNEL
-  sudo vim /etc/coder.d/coder.env
+  $ sudo vim /etc/coder.d/coder.env
   # Use systemd to start Coder now and on reboot
-  sudo systemctl enable --now coder
+  $ sudo systemctl enable --now coder
   # View the logs to ensure a successful start
-  journalctl -u coder.service -b
+  $ journalctl -u coder.service -b
+
+Or, just run the server directly:
+
+  $ coder server
 
 EOF
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`"path": "./CODE_OF_CONDUCT.md"`
`44`	`44`	`},`
`45`	`45`	`{`
`46`		`- "title": "Security policy",`
	`46`	`+ "title": "Security",`
`47`	`47`	`"description": "How to report vulnerabilities in Coder",`
`48`	`48`	`"path": "./SECURITY.md"`
`49`	`49`	`}`