From af6443a5eb55b6391bc0635c43d82f5aca4a05c1 Mon Sep 17 00:00:00 2001
From: b0xxer <barry@a9.local>
Date: Mon, 12 Feb 2024 07:01:09 -0600
Subject: [PATCH] * doc requirements * more docs * changed btc_init to include
 more features and set txindex to 1 * masked rpm-ostree-countme timer

---
 roles/apps/files/bitcoin/bin/btc_init  | 32 ++++++++++++++++++++++----
 roles/apps/files/docs/mkdocs.yml       | 25 +++++++++++++++++++-
 roles/apps/files/docs/requirements.txt |  1 +
 roles/config/tasks/main.yml            |  9 ++++++++
 roles/install/tasks/main.yml           |  1 +
 5 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/roles/apps/files/bitcoin/bin/btc_init b/roles/apps/files/bitcoin/bin/btc_init
index a9c3202..0ff8aa7 100644
--- a/roles/apps/files/bitcoin/bin/btc_init
+++ b/roles/apps/files/bitcoin/bin/btc_init
@@ -26,6 +26,12 @@ cat <<EOF > $HOME/.bitcoin/bitcoin.conf
 # MAINNET
 # TESTNET
 # REGTEST
+# MEMPOOLFULLRBF
+# MAXMEMPOOL
+# MEMPOOLEXPIRY
+# PERSISTMEMPOOL
+# MAXORPHANTX
+# BANTIME
 # SERVER
 # LISTEN
 # LISTENONION
@@ -34,6 +40,7 @@ cat <<EOF > $HOME/.bitcoin/bitcoin.conf
 # PRUNE
 # DISABLEWALLET
 # PRINTCONSOLE
+# WHITELIST
 # RPCUSER
 # RPCPASSWORD
 # RPCCONNECT
@@ -49,16 +56,30 @@ cat <<EOF > $HOME/.bitcoin/bitcoin.conf
 # REINDEXCHAINSTATE
 
 # network
+# Choose what network to connect to (mutually exclusive choice)
 mainnet=${MAINNET:-1}             
 testnet=${TESTNET:-0}             
-regtest=${REGTEST:-0}             
+regtest=${REGTEST:-0}
+# Allow all transactions to be replaced by RBF by default
+mempoolfullrbf=${MEMPOOLFULLRBF:-1}
+# Max size in MB for mempool memory reserve 
+maxmempool=${MAXMEMPOOL:-256}
+# Max time in hours before old mempool items expire 
+mempoolexpiry=${MEMPOOLEXPIRY:-336}
+blockfilterindex=${BLOCKFILTERINDEX:-1}
+# Save mempool to disk on shutdown
+persistmempool=${PERSISTMEMPOOL:-1}
+# Max num of orphan tx to be kept
+maxorphantx=${MAXORPHANTX:-50}
+# Time in mins to ban bad peers
+bantime=${BANTIME:-86400}
 
 # server
 server=${SERVER:-1}               
 listen=${LISTEN:-1}               
 listenonion=${LISTENONION:-0}     
 daemon=${DAEMON:-0}               
-txindex=${TXINDEX:-0}             
+txindex=${TXINDEX:-1}             
 prune=${PRUNE:-0}                 
 disablewallet=${DISABLEWALLET:-1} 
 printtoconsole=${PRINTTOCONSOLE:-1} 
@@ -70,10 +91,13 @@ rpccookiefile=.cookie
 #rpcconnect=${RPCCONNECT:-127.0.0.1} 
 #rpcport=${RPCPORT:-8332}         
 #rpcauth=${RPCAUTH:-xxx}          
+whitelist=${WHITELIST:-127.0.0.1}
 
 # performance
-dbcache=${DBCACHE:-2000}          
-maxconnections=${MAXCONNECTIONS:-40} 
+#Max cache size of db in mb
+dbcache=${DBCACHE:-2000}
+
+maxconnections=${MAXCONNECTIONS:-75} 
 maxuploadtarget=${MAXUPLOADTARGET:-5000} 
 
 # tor
diff --git a/roles/apps/files/docs/mkdocs.yml b/roles/apps/files/docs/mkdocs.yml
index c97182f..e1eb00e 100644
--- a/roles/apps/files/docs/mkdocs.yml
+++ b/roles/apps/files/docs/mkdocs.yml
@@ -1 +1,24 @@
-site_name: My Docs
+site_name: n0xb0x
+site_url: https://n0xb0x.org
+nav:
+    - Home: index.md
+    - Getting Started: install.md
+
+
+markdown_extensions:
+  - pymdownx.blocks.admonition
+  - pymdownx.blocks.definition
+  - pymdownx.blocks.details
+  - pymdownx.blocks.html
+  - pymdownx.blocks.tab
+  - pymdownx.caret
+  #- pymdownx.emoji
+  #- pymdownx.extra
+  - pymdownx.highlight
+  - pymdownx.inlinehilite
+  - pymdownx.keys
+  #- pymdownx.magiclink
+  #- pymdownx.mark
+  #- pymdownx.smartsymbols
+  #- pymdownx.tabbed
+  #- pymdownx.tilde
diff --git a/roles/apps/files/docs/requirements.txt b/roles/apps/files/docs/requirements.txt
index 4c430fd..472ca3e 100644
--- a/roles/apps/files/docs/requirements.txt
+++ b/roles/apps/files/docs/requirements.txt
@@ -1,2 +1,3 @@
 mkdocs==1.5.3
+pymdown-extensions==10.7
 
diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml
index 732cb6b..7629386 100644
--- a/roles/config/tasks/main.yml
+++ b/roles/config/tasks/main.yml
@@ -80,3 +80,12 @@
     state: started
     enabled: yes
   when: (zerotier_network is defined) and (zerotier_network|length>0)
+
+- name: Mask Fedora countme timer
+  become: yes
+  become_method: sudo
+  ansible.builtin.systemd_service:
+    name: rpm-ostree-countme.timer
+    state: stopped
+    masked: true
+
diff --git a/roles/install/tasks/main.yml b/roles/install/tasks/main.yml
index 7774713..e456ddd 100644
--- a/roles/install/tasks/main.yml
+++ b/roles/install/tasks/main.yml
@@ -35,6 +35,7 @@
       - telnet
       - cockpit
       - cockpit-networkmanager
+      - cockpit-storage
       - cockpit-ostree
       - cockpit-podman
       - zerotier-one