added files

Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu
+
+#RUN sudo apt-get update
+RUN apt-get update  
+RUN apt-get install -y ca-certificates
+ADD main /main
+ADD entrypoint.sh /entrypoint.sh
+ADD static /static
+WORKDIR /
+
+EXPOSE 8080
+ENTRYPOINT ["/entrypoint.sh"]
+

README.md

@@ -5,51 +5,22 @@
 
 
 
-# Ulbora CMS V4
-UlboraCMS Version 4, not yet released, is comming soon. UlboraCMS V4 will be a self-contained CMS (no database needed) using a JSON datastore with content served from memory. There will be three ways to get UlboraCMS V4: Linux binary, Windows binary, Mac binary, or Docker. UlboraCMS V4 is written and Golang and users will be able to build it for other platforms too.
+# Ulbora CMS
+UlboraCMS is a self-contained CMS (no database needed) written in Golang. It uses a JSON datastore with content saved in both json files and in memory. You can download and upload a single binary backup file containing content, images, and templates as needed.
 
-UlboraCMS V4, not yet released, has a very small memory footprint of around 15 MiB; it's fast and easy to deploy.
-
-With the new UlboraCMS version 4, users can quickly spin up a website on any server where a binary file can run or on Docker. Users can quickly edit content and banners and publish the site in minutes. No need to configure database connection or other complex configurations.
-
-### UlboraCSM V4 is also easier to use, setup and deploy than static site generators. UlboraCMS also has a built-in contact form that eliminates the need for external contact forms.
-
-Banners in UlboraCMS can be used to add non-blockable ads to sites or for other things like announcements.
-
-
-UlboraCMS 2.1 (Deprecated) Latest version: [Headless UlboraCMS](https://github.com/Ulbora/UlboraContentService)
-==============
-
-## [Headless UlboraCMS](https://github.com/Ulbora/UlboraContentService) A Headless CMS built with Golang, and it's fast.
-
-[![Build Status][travis-image]][travis-url]
-
-
-[UlboraCMS 2.1](http://www.ulboracms.org) is MEAN stack CMS and blog platform.
-
-[Ulbora CMS Forum] (https://groups.google.com/forum/?hl=en#!forum/ulbora-cms-forum)
-
-[Ulbora CMS Help] (https://groups.google.com/forum/?hl=en#!forum/ulbora-cms-help)
-
-UlboraCMS is built with MongoDB, ExpressJS 4.*, and Node.js, templates are handblebars, EJS, Jade, or AngularJS.
 
 ## Docker Container
 
 The easiest way to get Ulbora CMS is to use Docker.
 
-Get the Docker Ulbora Mongodb container here: link coming 
-
-Get the Docker Ulbora CMS container here: link coming
 
 ## Templates
 
-You can build multiple templates with UlboraCMS and switch between the templates through the administration screen. Templates can even contain both Angular and convention server-side technologies.
+You can build multiple templates with Ulbora CMS and switch between the templates through the administration screen. 
 
 New templates can easily be installed by zipping them as tar.gz files and following a simple upload process in the administration screens.
 
 
-This is currently Release version 2.1
-
 
 
 [MIT](LICENSE)

build.sh

@@ -0,0 +1,2 @@
+go build -o main *.go
+# GO111MODULE=on go build

data/contentStore/home.json

@@ -1 +1 @@
-{"name":"home","title":"Home Page","subject":"Ulbora CMS","author":"Ken Williamson","createDate":"2020-04-09T12:32:39.806769116-04:00","modifiedDate":"2020-04-09T18:48:54.438919599-04:00","hits":171,"metaAuthorName":"","metaDesc":"","metaKeyWords":"UlboraCMS, CMS, Ulbora, templates, screens","metaRobotKeyWords":"","text":"PHA+QSBUaGVtZSBmb3IgVWxib3JhIENNUzwvcD4=","TextHTML":"","archived":false,"visible":true,"UseModifiedDate":false,"blogPost":false}
+{"name":"home","title":"Home Page","subject":"Ulbora CMS","author":"Ken Williamson","createDate":"2020-04-09T12:32:39.806769116-04:00","modifiedDate":"2020-04-12T17:51:12.893389012-04:00","hits":186,"metaAuthorName":"","metaDesc":"","metaKeyWords":"UlboraCMS, CMS, Ulbora, templates, screens","metaRobotKeyWords":"","text":"PHA+QSBUaGVtZSBmb3IgVWxib3JhIENNUzwvcD4=","TextHTML":"","archived":false,"visible":true,"UseModifiedDate":false,"blogPost":false}

entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./main
+
+

handlers/contactFormHandler.go

@@ -17,6 +17,7 @@ func (h *CmsHandler) ContactForm(w http.ResponseWriter, r *http.Request) {
 	h.Log.Debug("template: ", h.AdminTemplates)
 	var cp captchaData
 	cp.CaptchaDataSitekey = h.CaptchaDataSitekey
+	h.Log.Debug("CaptchaDataSitekey: ", cp.CaptchaDataSitekey)
 	h.Templates.ExecuteTemplate(w, contactForm, &cp)
 }
 

main.go

@@ -84,7 +84,7 @@ func main() {
 	}
 
 	var l lg.Logger
-	//////l.LogLevel = lg.AllLevel
+	l.LogLevel = lg.AllLevel
 
 	var ms ml.SecureSender
 	ms.MailHost = mailHost
@@ -103,6 +103,7 @@ func main() {
 	ch.Log = &l
 	ch.User = &u
 
+	ch.Log.Debug("CaptchaDataSitekey in main: ", os.Getenv("CMS_CAPTCHA_DATA_SITE_KEY"))
 	ch.CaptchaSecret = captchaSecret
 	ch.CaptchaDataSitekey = captchaDataSiteKey
 	ch.ContactMailSenderAddress = contactMailSenderAddress
@@ -196,6 +197,8 @@ func main() {
 
 	router.PathPrefix("/").Handler(http.FileServer(http.Dir("./static/")))
 
+	l.LogLevel = lg.OffLevel
+
 	fmt.Println("Ulbora CMS is Running on Port " + port)
 	go func() {
 		if err := srv.ListenAndServe(); err != nil {