Land parked local edits: ftb tax dir, root-ubuntu marker, feedback sites.d

README.md

@@ -1670,7 +1670,7 @@ ftb status
 ```
 
 - **Which form, which line.** `src/ftb-extract.py` (PyMuPDF) reads every PDF
-  under `--dir` (default `~/dottemplates/docs/taxes/years`): Form 100S line 20
+  under `--dir` (default `~/Documents/taxes/years` (override with `FTB_TAX_DIR`)): Form 100S line 20
   "net income for tax purposes" and line 15 for a corporation, Form 540 line 17
   "California AGI" plus filing status, name, SSN and address for a person. Only
   the last five closed years count; newest first, line 20 before 15.

bin/ftb.ts

@@ -61,7 +61,7 @@ import { isMain } from '../src/is-main.ts';
 import { pullVault } from '../src/vault.ts';
 import { WcagError } from '../src/wcag.ts';
 
-const DEFAULT_DIR = join(homedir(), 'dottemplates', 'docs', 'taxes', 'years');
+const DEFAULT_DIR = process.env.FTB_TAX_DIR ?? join(homedir(), 'Documents', 'taxes', 'years');
 
 const USAGE = `Usage:
   ftb secrets [--dir D] [--json]       the shared secrets each filed CA return supports, best first

dev2/sites.d/feedback.profullstack.com.json

@@ -0,0 +1,5 @@
+{
+ "branch": "master",
+ "env_remove": ["TURSO_DATABASE_URL", "TURSO_AUTH_TOKEN"],
+ "db_sslparams": "sslmode=require"
+}

root-ubuntu.sh

@@ -6297,6 +6297,7 @@ write_landing_page() {
 	# difference between that page and a real one somebody wrote.
 	if [[ -e "$LANDING" ]] \
 		&& ! grep -q "$LANDING_MARKER" "$LANDING" \
+		&& ! grep -q 'generated by dotfiles/install/root-ubuntu.sh' "$LANDING" \
 		&& ! grep -q 'generated by dottemplates/root-ubuntu.sh' "$LANDING" \
 		&& ! grep -q 'User pages are at' "$LANDING"; then
 		info "$LANDING was edited by hand -- leaving it alone"

test/root-ubuntu.test.ts

@@ -359,7 +359,8 @@ describe('upgrading a box that this script already provisioned', () => {
   // script has stamped. Renaming the marker without keeping the old one makes
   // every already-provisioned box decide its own page was hand-edited, and
   // nothing afterwards can tell that page from one somebody really wrote.
-  it('still recognises the marker from when this lived in the dotfiles repo', () => {
+  it('still recognises prior dotfiles and dottemplates landing pages', () => {
+    expect(SOURCE).toContain('generated by dotfiles/install/root-ubuntu.sh');
     expect(SOURCE).toContain('generated by dottemplates/root-ubuntu.sh');
     expect(SOURCE).toContain('generated by cli-tools/root-ubuntu.sh');
   });