From: Matt Birkholz Date: Sat, 30 Mar 2024 23:11:02 +0000 (-0500) Subject: Truncate long lines in examples. Wordsmith (verb agreement). X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bfb39b54e28fee4eafcafc166fdab81fb4265cad;p=Network Truncate long lines in examples. Wordsmith (verb agreement). --- diff --git a/README.org b/README.org index e2d6b62..90a28b8 100644 --- a/README.org +++ b/README.org @@ -592,7 +592,7 @@ entered as shown below). $ sudo apt install python3-certbot-apache $ sudo certbot --apache -d birchwood-abbey.net ... -Enter email address (...) (Enter 'c' to cancel): webmaster@birchwood-a +Enter email address (...) (Enter 'c' to cancel): webmaster@birchwood- bbey.net ... Please read the Terms of Service at @@ -603,30 +603,30 @@ Would you be willing to share your email address... ... (Y)es/(N)o: Y ... -Deploying Certificate to VirtualHost /etc/apache2/sites-enabled/birchw +Deploying Certificate to VirtualHost /etc/apache2/sites-enabled/birch ood-abbey.net.conf -Please choose whether or not to redirect HTTP traffic to HTTPS, removi +Please choose whether or not to redirect HTTP traffic to HTTPS, remov ng HTTP access. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1: No redirect - Make no further changes to the webserver configuratio +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +1: No redirect - Make no further changes to the webserver configurati n. ... -Select the appropriate number [1-2] then [enter] (press 'c' to cancel) +Select the appropriate number [1-2] then [enter] (press 'c' to cancel : 1 -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Congratulations! You have successfully enabled https://birchwood-abbey +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Congratulations! You have successfully enabled https://birchwood-abbe .net You should test your configuration at: https://www.ssllabs.com/ssltest/analyze.html?d=birchwood-abbey.net -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IMPORTANT NOTES: - Your account credentials have been saved in your Certbot configuration directory at /etc/letsencrypt. You should make a - secure backup of this folder now. This configuration directory will + secure backup of this folder now. This configuration directory wil also contain certificates and private keys obtained by Certbot so making regular backups of this folder is ideal. ... @@ -635,7 +635,7 @@ IMPORTANT NOTES: Your key file has been saved at: /etc/letsencrypt/live/birchwood-abbey.net/privkey.pem Your cert will expire on 2019-01-13. To obtain a new or tweaked - version of this certificate in the future, simply run certbot again + version of this certificate in the future, simply run certbot agai with the "certonly" option. To non-interactively renew *all* of your certificates, run "certbot renew" #+END_EXAMPLE @@ -1985,9 +1985,9 @@ The ~ExecStartPre=/bin/sleep 30~ is intended to avoid recent hangs in The abbey uses Zoneminder to record video from PoE IP HD security cameras. The Abbey DVR Role installs Zoneminder and configures it to record to =/Zoneminder/=, the mount point for a separate, large -storage volume. It follows the instructions in -=/usr/share/doc/zoneminder/README.Debian= to create the ~zm~ database -and configuring Apache. +storage volume. It follows the instructions in Zoneminder's +=README.Debian= (in =/usr/share/doc/zoneminder/=) to create the ~zm~ +database and configure Apache. ** DVR Machine Setup @@ -2414,7 +2414,7 @@ these edits, the ~git diff~ command should produce something like the following. #+BEGIN_SRC diff -diff --git a/roles/mythtv-deb/tasks/main.yml b/roles/mythtv-deb/tasks/main.yml +diff --git a/roles/mythtv-deb/tasks/main.yml b/roles/mythtv-deb/tasks index 868c9b7..3dcf115 100644 --- a/roles/mythtv-deb/tasks/main.yml +++ b/roles/mythtv-deb/tasks/main.yml @@ -2426,7 +2426,7 @@ index 868c9b7..3dcf115 100644 apt: name: '{{ lookup("flattened", deb_pkg_lst ) }}' -diff --git a/roles/qt5/tasks/qt5-deb.yml b/roles/qt5/tasks/qt5-deb.yml +diff --git a/roles/qt5/tasks/qt5-deb.yml b/roles/qt5/tasks/qt5-deb.ym index 7a1a0bc..26ba782 100644 --- a/roles/qt5/tasks/qt5-deb.yml +++ b/roles/qt5/tasks/qt5-deb.yml @@ -2805,7 +2805,7 @@ the list of "inputs" available in a postal code typically ends with the OTA (over the air) broadcasts. #+BEGIN_EXAMPLE - $ tv_grab_zz_sdjson --configure --config-file .mythtv/Mr.Antenna.xmltv + $ tv_grab_zz_sdjson --configure --config-file .mythtv/Mr.Antenna.xml Cache file for lineups, schedules and programs. Cache file: [/home/mythtv/.xmltv/tv_grab_zz_sdjson.cache] If you are migrating from a different grabber selecting an alternate @@ -2815,7 +2815,7 @@ the OTA (over the air) broadcasts. 1: tv_grab_na_dd Format (eg: I12345.labs.zap2it.com) 2: MythTV Internal DD Grabber Format (eg: 12345) Select one: [0,1,2 (default=0)] - As the JSON data only includes the previously shown date normally the + As the JSON data only includes the previously shown date normally th XML output should only have the date. However some programs such as older versions of MythTV also need a time. Select previously shown format: @@ -2827,7 +2827,7 @@ the OTA (over the air) broadcasts. Schedules Direct password. Password: PASSWORD ** POST https://json.schedulesdirect.org/20141201/token ==> 200 OK - ** GET https://json.schedulesdirect.org/20141201/status ==> 200 OK (1s) + ** GET https://json.schedulesdirect.org/20141201/status ==> 200 OK ( ** GET https://json.schedulesdirect.org/20141201/lineups ==> 200 OK This step configures the lineups enabled for your Schedules Direct account. It impacts all other configurations and programs using the