From: Will Budic <redacted>
Date: Fri, 17 Nov 2023 07:15:30 +0000 (+1100)
Subject: merge crap
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=39ece800af50303a7de7b54b1abb9fedbd93a6da;p=LifeLog.git

merge crap
---

39ece800af50303a7de7b54b1abb9fedbd93a6da
diff --cc .gitignore
index bc9d7ad,3b86f5b..134ba1b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,30 +1,31 @@@
- cgisess_*
+ *.autosave
+ *.db
+ *.o
+ *.psp
+ *.pyc
+ *.pyo
+ *.swo
+ *.swp
+ *.tar
+ *.pid
  *.log
+ *.osz
+ *.swm
+ *.swn
+ cgisess_*
+ .DS_Store
+ .idea
+ .vscode
+ .vstags
+ .history
+ .history/*
+ tags
+ */bck/*
+ bck_*
+ dbLifeLog/current_theme
+ lighttpd.conf
+ dump_*
+ *.rdf
+ tree_*.cnf
+ vscode_local_extensions/extensions.json
++
diff --cc Installation_PostgreSQL.txt
index 108991e,040d2cf..94f7acd
--- a/Installation_PostgreSQL.txt
+++ b/Installation_PostgreSQL.txt
@@@ -101,7 -107,7 +107,8 @@@ pg_restore -U lifelog -d lifelog < life
      Important pgAdmin4 Notes
  ###############################
  
- What pgAdmin4 and their documentation and installation doesn't describe, 
+ What pgAdmin4 and their documentation and installation doesn't describe,
++
  that the default web server is python based. The web based package will install the apache web server.
  You most likely don't want that. And the pgAdmin-desktop, you possibly don't need that.
  (Can use any browser instead) :)
diff --cc dbLifeLog/data_admin_log.db
index 63f2452,ea72bd5..0000000
deleted file mode 100755,100644
Binary files differ
diff --cc htdocs/cgi-bin/main.cgi
index 254ed84,e6282b5..0799a7a
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@@ -850,7 -850,7 +850,8 @@@ my $frm = qq
  	&nbsp;<button type="button" onclick="return setNow();">Now</button>
  			&nbsp;<button type="reset"  onclick="setNow();resetDoc(); return true;">Reset</button>
  
-                 <span id="cat_desc" name="cat_desc">Please Wait...</span>
++
+                 <span id="cat_desc" name="cat_desc"><br>Please Wait...<img src="images/Wedges-9.1s-64px.png"></span>
  
  			&nbsp;&nbsp;&nbsp;Category:&nbsp;
  
diff --cc htdocs/cgi-bin/rss_output/tree_feed_CPAN.cnf
index 29e6527,58763c0..30c20d3
--- a/htdocs/cgi-bin/rss_output/tree_feed_CPAN.cnf
+++ b/htdocs/cgi-bin/rss_output/tree_feed_CPAN.cnf
@@@ -13,78 -13,6 +13,81 @@@
        >Feed>
        <Brew<
           <Item<
++<<<<<<< HEAD
 +          Date: 2023-10-02 01:53:10
 +          Link: https://metacpan.org/release/NICOMEN/Config-ROFL-1.01
 +          Title: Config-ROFL-1.01
 +            <Description<
 +            [#[
 +               Yet another config module
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
 +          Date: 2023-10-02 01:42:52
 +          Link: https://metacpan.org/release/KIMOTO/SPVM-Digest-SHA-0.061001
 +          Title: SPVM-Digest-SHA-0.061001
 +            <Description<
 +            [#[
 +               <p>SHA-1/224/256/384/512</p><p>Changes for 0.061001 - 2023-10-02</p><ul><li>Requirement Changes</li>
 +               <li>Exception Message Changes</li>
 +               <li>Internal Changes</li>
 +               <li>Document Changes</li>
 +               </ul>
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
 +          Date: 2023-10-02 01:12:28
 +          Link: https://metacpan.org/release/KIMOTO/SPVM-MIME-Base64-1.001003
 +          Title: SPVM-MIME-Base64-1.001003
 +            <Description<
 +            [#[
 +               <p>Base64 Encoding/Decoding</p><p>Changes for 1.001003 - 2023-10-02</p><ul><li>Exception Message Changes</li>
 +               <li>Document Changes</li>
 +               </ul>
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
 +          Date: 2023-10-02 00:54:37
 +          Link: https://metacpan.org/release/KIMOTO/SPVM-Digest-MD5-1.001003
 +          Title: SPVM-Digest-MD5-1.001003
 +            <Description<
 +            [#[
 +               <p>MD5</p><p>Changes for 1.001003 - 2023-10-02</p><ul><li>Requirement Changes</li>
 +               <li>Exception Message Changes</li>
 +               <li>Document Changes</li>
 +               <li>Incompatible Changes</li>
 +               </ul>
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
 +          Date: 2023-10-02 00:05:25
 +          Link: https://metacpan.org/release/PERLANCAR/ColorTheme-2.1.4
 +          Title: ColorTheme-2.1.4
 +            <Description<
 +            [#[
 +               <p>Color themes</p><p>Changes for 2.1.4 - 2023-07-14</p><ul><li>No spec changes.</li>
 +               <li>[doc] Mention somewhat related specification: BorderStyle.</li>
 +               </ul>
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
 +          Date: 2023-10-01 23:42:36
 +          Link: https://metacpan.org/release/NICOMEN/Config-ROFL-1.0
 +          Title: Config-ROFL-1.0
 +            <Description<
 +            [#[
 +               Yet another config module
 +            ]#]
 +            >Description>
 +         >Item>
 +         <Item<
++=======
++>>>>>>> origin/2.6.dev
            Date: 2023-10-01 17:36:06
            Link: https://metacpan.org/release/MIK/CryptX-0.079_003
            Title: CryptX-0.079_003
@@@ -132,9 -60,7 +135,13 @@@
            Title: CryptX-0.079
              <Description<
              [#[
++<<<<<<< HEAD
 +               <p>Cryptographic toolkit</p><p>Changes for 0.079 - 2023-01-10</p><ul><li>fix #92 update libtomcrypt</li>
 +               <li>bundled libtomcrypt update branch:develop (commit:1e629e6f 2023-06-22)</li>
 +               </ul>
++=======
+                Cryptographic toolkit
++>>>>>>> origin/2.6.dev
              ]#]
              >Description>
           >Item>
@@@ -1131,5 -1057,71 +1138,74 @@@
              ]#]
              >Description>
           >Item>
++<<<<<<< HEAD
++=======
+          <Item<
+           Date: 2023-09-26 01:46:16
+           Link: https://metacpan.org/release/KIMOTO/SPVM-0.989045
+           Title: SPVM-0.989045
+             <Description<
+             [#[
+                <p>SPVM Language</p><p>Changes for 0.989045 - 2023-09-26</p><ul><li>New Features</li>
+                </ul>
+             ]#]
+             >Description>
+          >Item>
+          <Item<
+           Date: 2023-09-26 00:25:45
+           Link: https://metacpan.org/release/BLIAKO/Config-JSON-Enhanced-0.03
+           Title: Config-JSON-Enhanced-0.03
+             <Description<
+             [#[
+                <p>JSON-based config with C/Shell-style comments, verbatim sections and variable substitutions</p><p>Changes for 0.03</p><ul><li>-Added the ability for the user to use custom comment style by specifying an opening and, optionally, a closing comment string. By adding a new comment style: 'custom()()'. -Added the ability for the user to specify if comments within strings (keys or scalar string values in the JSON) should be retained or removed. By adding a new optional parameter 'remove-comments-in-strings' to sub 'config2perl()'. -Added the ability for the user to increase verbosity of sub 'config2perl()'. The verbatim sections are checked for templated variables but do not have any comments contained in them to be replaced. All comments in Verbatim Sections are now left as they are. -Added the ability for the user to select tags for denoting variables and verbatim sections, the default value is '&lt;%' and '%&gt;'. -Made documentation's SYNOPSIS clearer. -Added 'META_MERGE' key in Makefile.PL. -Added CI via github actions (thanks https://perlmonks.org/?node_id=11127196 and https://perlmonks.org/?node_id=11154429).</li>
+                </ul>
+             ]#]
+             >Description>
+          >Item>
+          <Item<
+           Date: 2023-09-26 00:05:24
+           Link: https://metacpan.org/release/PERLANCAR/App-EANUtils-0.003
+           Title: App-EANUtils-0.003
+             <Description<
+             [#[
+                <p>Utilities related to EAN (International/European Article Number)</p><p>Changes for 0.003 - 2023-01-28</p><ul><li>[ux] Add examples.</li>
+                <li>[cli check-ean8][cli check-ean13][ux] print message unless --quiet (-q) option is given.</li>
+                </ul>
+             ]#]
+             >Description>
+          >Item>
+          <Item<
+           Date: 2023-09-25 22:17:51
+           Link: https://metacpan.org/release/SANKO/Template-Liquid-1.0.23
+           Title: Template-Liquid-1.0.23
+             <Description<
+             [#[
+                <p>A Simple, Stateless Template System</p><p>Changes for 1.0.23 - 2023-09-25T22:13:36Z</p><ul><li>Resolve issue around passing a single string to {%for ... %} (amit777++)</li>
+                </ul>
+             ]#]
+             >Description>
+          >Item>
+          <Item<
+           Date: 2023-09-25 21:42:40
+           Link: https://metacpan.org/release/ZHMYLOVE/X11-XCB-0.20
+           Title: X11-XCB-0.20
+             <Description<
+             [#[
+                perl bindings for libxcb
+             ]#]
+             >Description>
+          >Item>
+          <Item<
+           Date: 2023-09-25 21:26:59
+           Link: https://metacpan.org/release/LEONT/Magic-Coerce-0.002
+           Title: Magic-Coerce-0.002
+             <Description<
+             [#[
+                <p>magical coercers for scalar values</p><p>Changes for 0.002 - 2023-09-25T23:26:41+02:00</p><ul><li>Include ppport.h for backwards-compatability</li>
+                </ul>
+             ]#]
+             >Description>
+          >Item>
++>>>>>>> origin/2.6.dev
        >Brew>
  >>
diff --cc htdocs/test.html
index 3911662,4abc361..b8c292a
--- a/htdocs/test.html
+++ b/htdocs/test.html
@@@ -1,5 -1,84 +1,85 @@@
+ <head>
+ <style>
+ .textual {
+     width: 40%;
+ }
+ .textual p::first-letter {
+     color: blueviolet;
+     initial-letter: 3 2;
+     padding-right:  5pt;
+ }
+ </style>
+ <style>
+  .styled-table {
+     border-collapse: collapse;
+     margin: 25px 0;
+     font-size: 0.9em;
+     font-family: sans-serif;
+     min-width: 80%;
+     box-shadow: 8px 10px 20px rgba(0, 0, 0, 0.572);
+ }
+ .styled-table thead tr {
+     background-color: #00fbff;
+     color: #121111;
+     text-align: left;
+ }
+ 
+ .styled-table td{
+     border:1px solid black;padding: 5px;margin: 0;
+     padding: 12px 15px;
+ }
+ .styled-table tbody tr {
+     border-bottom: 1px solid #eff190;
+ }
+ .styled-table tbody tr:nth-of-type(even) {
+     background-color: #f9b5b5;
+ }
+ .styled-table tbody tr:last-of-type {
+     border-bottom: 1px solid #000000;
+     border-right: 1px solid #000000;
+ }
+ .styled-table tbody tr:hover {
+     font-weight: bold;
+     background-color: #98fce8;
+ }
+ </style>
+ </head>
  <body>
  <h1>Hello From THTTPD</h1>
+ <table class="styled-table">
+     <thead>
+         <td>ID</td>
+         <td>Contact</td>
+         <td>ECHASH</td>
+     </thead>
+     <tbody>
+         <tr>
+             <td>1</td>
+             <td>webadmin</td>
+             <td>990MWWLWM8C2MI8K</td>
+         </tr>
+         <tr><td colspan="3">A&nbsp;</td></tr>
+     </tbody>
+ </table>
+ 
+ 
+ 
+ 
+ <div class="clear"></div>
  
  <b>To run the Web Application please click on <a href="cgi-bin">CGI-BIN</a>.</b>
+ <div class="textual">
+ <p>MaryLou wore the tiara with real pride.
+ There was something that made doing anything she didn't really want to do a bit easier when she wore it.
+  She really didn't care what those staring through the window were thinking as she vacuumed her apartment.
+ </p>
+ </div>
+ <p>
+   The water rush down the wash and into the slot canyon below. Two hikers had started the day to sunny weather without a cloud in the sky, but they hadn't thought to check the weather north of the canyon. Huge thunderstorms had brought a deluge o rain and produced flash floods heading their way. The two hikers had no idea what was coming.
+ </p><p>
+     There are different types of secrets. She had held onto plenty of them during her life, but this one was different. She found herself holding onto the worst type. It was the type of secret that could gnaw away at your insides if you didn't tell someone about it, but it could end up getting you killed if you did.
+ </p>
+ 
+ </p>
++
  </body>
diff --cc lighttpd.conf
index 6fd08f9,6af6f1e..0c15fa7
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@@ -3,7 -3,7 +3,6 @@@ dir-listing.activate = "enable
  server.port = 80
  
  mimetype.assign = (
-   ".html" => "text/html",  
 -  ".html" => "text/html",
    ".md"   => "text/plain",
    ".txt" => "text/plain",
    ".jpg" => "image/jpeg",
@@@ -31,14 -31,21 +30,23 @@@ server.modules = 
  
  
  index-file.names = ( "index.html" )
- server.breakagelog = "/home/will/LifeLog/lighttpd_server.log"
++
+ server.breakagelog = "lighttpd_server.log"
  cgi.assign = ( ".pl"  => "/usr/bin/perl", ".cgi" => "/usr/bin/perl" )
  cgi.x-sendfile = "disable"
  
- $SERVER["socket"] == "104.225.141.231:443" { 
- ssl.engine = "enable"                                                                                                                           
- ssl.pemfile = "/etc/lighttpd/server.pem"
- server.name = "perl1.xip.com" 
+ 
+ $SERVER["socket"] == ":443" {
+ #
+ ssl.engine = "enable"
+ ## Selfsigned SSL Certificate location created with openssl req -x509 -newkey rsa:4096 -sha256 ...etc...
+ #https://www.interserver.net/tips/kb/how-to-configure-ssl-in-lighttpd/
+ ssl.pemfile = "/home/will/dev/nomad.pem"
+ server.name = "nomad.net"
  }
+ 
+ # Create soft link in cgi-bin: to desired static pages directory.
+ # with i.e: ln -s /home/will/dev/LifeLog/htdocs/ static
  $HTTP["url"] =~ "^/static($|/)" { server.dir-listing = "enable" }
 -$HTTP["url"] =~ "^docs($|/)" { server.dir-listing = "enable" }
 +$HTTP["url"] =~ "^docs($|/)" { server.dir-listing = "enable" }
++