about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--tools/nginx.html15
-rw-r--r--tools/scripts/install-nginx.sh5
2 files changed, 14 insertions, 6 deletions
diff --git a/tools/nginx.html b/tools/nginx.html
index 5a43a4c..9fd38b9 100644
--- a/tools/nginx.html
+++ b/tools/nginx.html
@@ -74,7 +74,7 @@
         If you enter '.', the field will be left blank.
         -----
         Country Name (2 letter code) [AU]:PT
-        State or Province Name (full name) [Some-State]:Porto
+        State or Province Name (full name) [Some-State]:
         Locality Name (eg, city) []:
         Organization Name (eg, company) [Internet Widgits Pty Ltd]:
         Organizational Unit Name (eg, section) []:
@@ -91,12 +91,15 @@
         <p>Sign SSL cetificate;</p>
 
         <pre>
-        $ sudo openssl x509 -req -days 365 -in /etc/ssl/certs/nginx.csr -signkey /etc/ssl/keys/nginx.key -out /etc/ssl/certs/nginx.crt
+        $ sudo openssl x509 -req -days 365 \
+            -in /etc/ssl/certs/nginx.csr \
+            -signkey /etc/ssl/keys/nginx.key \
+            -out /etc/ssl/certs/nginx.crt
+        </pre>
         Signature ok
-        subject=/C=PT/ST=Porto/O=Internet Widgits Pty Ltd/CN=core.privat-network.net
+        subject=/C=PT/ST=Some-State/O=Internet Widgits Pty Ltd/CN=core.privat-network.net
         Getting Private key
         Enter pass phrase for /etc/ssl/keys/nginx.key:
-        $
         </pre>
 
         <p>Having password is a good idea, but requires it every
@@ -105,9 +108,11 @@
         <pre>
         $ sudo cp /etc/ssl/keys/nginx.key /etc/ssl/keys/nginx.key.pass
         $ sudo openssl rsa -in /etc/ssl/keys/nginx.key.pass -out /etc/ssl/keys/nginx.key
+        </pre>
+
+        <pre>
         Enter pass phrase for /etc/ssl/keys/nginx.key.org:
         writing RSA key
-        $
         </pre>
 
         <h2 id="nginxconf">3. Nginx Configuration</h2>
diff --git a/tools/scripts/install-nginx.sh b/tools/scripts/install-nginx.sh
index 5553692..7fee79b 100644
--- a/tools/scripts/install-nginx.sh
+++ b/tools/scripts/install-nginx.sh
@@ -11,7 +11,10 @@ usermod -m -d /srv/www nginx
 
 openssl genrsa -des3 -out /etc/ssl/keys/nginx.key 2048
 openssl req -new -key /etc/ssl/keys/nginx.key -out /etc/ssl/certs/nginx.csr
-openssl x509 -req -days 365 -in /etc/ssl/certs/nginx.csr -signkey /etc/ssl/keys/nginx.key
+openssl x509 -req -days 365 \
+            -in /etc/ssl/certs/nginx.csr \
+            -signkey /etc/ssl/keys/nginx.key \
+            -out /etc/ssl/certs/nginx.crt
 
 cp /etc/ssl/keys/nginx.key /etc/ssl/keys/nginx.key.pass
 openssl rsa -in /etc/ssl/keys/nginx.key.pass -out /etc/ssl/keys/nginx.key
188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333