updated bookstack

bookstack/docker-compose.yml

@@ -1,61 +1,56 @@
 ################################################################################
 # Bookstack
-# make sure you use the $PREFIX from .env for project_name
-# docker-compose -p project_name up -d
 #
-# Importing directly to the db (phpmydadmin)
+# Sample .env
-# you have to run the following in the container:
-# php artisan bookstack:regenerate-permissions
 #
-# Version 1
+# DB_USER=bookstack
+# DB_PASSWORD=ChnageThisPassword
+# APP_URL=http://localhost:8248
+# APP_KEY=32CharacterKey123456789012345678
+# NETWORKNAME=admin_web
 ################################################################################
 version: '2'
 
-volumes:
-  bookstack-db:
-  bookstack-uploads:
-  bookstack-storage:
-
 networks:
-  admin_web:
+  default:
     external:
-      name: admin_web
+      name: ${NETWORKNAME:-default} 
 
 services:
 
-  bookstack-db:
+   bookstack-db:
-    image: mariadb:${DB_V}
+    image: mariadb:latest # https://hub.docker.com/_/mariadb
     restart: always
     volumes:
-      - bookstack-db:/var/lib/mysql
+      - ./data/db:/var/lib/mysql
-    networks:
+      - "/etc/timezone:/etc/timezone:ro"
-      - admin_web
+      - "/etc/localtime:/etc/localtime:ro"
     command: --max_allowed_packet=32505856
     environment:
-      MYSQL_ROOT_PASSWORD: ${BOOKSTACK_MYSQL_ROOT_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ChangeThisToRandom
-      MYSQL_USER: bookstack
+      MYSQL_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${BOOKSTACK_MYSQL_PASSWORD}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
-      MYSQL_DATABASE: bookstack
+      MYSQL_DATABASE: ${DB_USER}
 
-  # https://hub.docker.com/r/solidnerd/bookstack
   bookstack:
-    image: solidnerd/bookstack:${BOOKSTACK_V}
+    image: solidnerd/bookstack:latest # https://hub.docker.com/r/solidnerd/bookstack
     depends_on:
       - bookstack-db
     environment:
-      - DB_HOST=${PREFIX}_bookstack-db_1:3306
+      - DB_HOST=bookstack-db:3306
-      - DB_DATABASE=bookstack
+      - DB_DATABASE=${DB_USER}
-      - DB_USERNAME=bookstack
+      - DB_USERNAME=${DB_USER}
-      - DB_PASSWORD=${BOOKSTACK_MYSQL_PASSWORD}
+      - DB_PASSWORD=${DB_PASSWORD}
-      - APP_URL=https://${BOOKSTACK_DOMAIN_NAME}
+      - APP_URL=${APP_URL:-http://localhost:8248}
-    networks:
+      - REVISION_LIMIT=false
-      - admin_web
+      - APP_KEY=${APP_KEY}
+      - APP_TIMEZONE=America/Vancouver
     volumes:
-      - bookstack-uploads:/var/www/bookstack/public/uploads
+      - ./data/uploads:/var/www/bookstack/public/uploads
-      - bookstack-storage:/var/www/bookstack/storage/uploads
+      - ./data/storage:/var/www/bookstack/storage/uploads
-    labels:
+      - ./php.ini:/usr/local/etc/php/php.ini
-      - "traefik.enable=true"
+      - "/etc/timezone:/etc/timezone:ro"
-      - "traefik.http.routers.${PREFIX}_bookstack.rule=Host(`${BOOKSTACK_DOMAIN_NAME}`)"
+      - "/etc/localtime:/etc/localtime:ro"
-      - "traefik.http.routers.${PREFIX}_bookstack.entrypoints=websecure"
+    ports:
-      - "traefik.http.routers.${PREFIX}_bookstack.tls.certresolver=letsencrypt"
+      - "8248:8080"
-      - "traefik.http.services.${PREFIX}_bookstack.loadbalancer.server.port=8080"
+   

bookstack/env-sample

@@ -1,11 +0,0 @@
-# Domains & Project
-PREFIX=p1
-BOOKSTACK_DOMAIN_NAME=bookstack.nickyeoman.com
-
-# Passwords
-BOOKSTACK_MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass!
-BOOKSTACK_MYSQL_PASSWORD=Again2ASecurepass!
-
-# Software versions
-DB_V=10.4.11
-BOOKSTACK_V=0.29.0

bookstack/find-fix.html

@@ -1,3 +0,0 @@
-<p>
-  SELECT CONCAT( '<li><a href="','https://bookstack.nickyeoman.com/books/emails/page/',slug,'/edit">',slug,'</a></li>')  FROM `pages` WHERE `text` LIKE 'text_var' ORDER BY `id`  DESC
-</p>

bookstack/txt2bookstack.py

@@ -1,51 +0,0 @@
-################################################################################
-# use like this: python3 run.py > test.sql
-# TODO: you need to change the last comma to a semi colon for it to work in mysql
-# php artisan bookstack:regenerate-permissions
-################################################################################
-
-import os
-import html
-directory = '/home/nick/working/emails-202003'
-
-# The insert statement to insert a page
-print("INSERT INTO `pages` (`id`, `book_id`, `chapter_id`, `name`, `slug`, `html`, `text`, `priority`, `created_at`, `updated_at`, `created_by`, `updated_by`, `restricted`, `draft`, `markdown`, `revision_count`, `template`) VALUES" )
-
-os.chdir(directory)
-
-for filename in os.listdir(directory):
-
-    if filename.endswith(".txt"):
-        f = open(filename)
-
-        #print filename
-        #print(filename)
-
-        #print filenmae with no extension
-        base=os.path.basename(filename)
-        filenoext=os.path.splitext(base)
-        filenoext=str(filenoext[0])
-        #print(filenoext[0])
-
-        # print file contents html safe
-        lines = f.read()
-        htmlcontentdirty=str(html.escape(lines))
-        htmlcontentspaces=htmlcontentdirty.replace('\r', '<br />').replace('\n', '<br />')
-        htmlcontent=' '.join(htmlcontentspaces.split())
-
-        #generate slug
-        slugnospace=str(filenoext).replace(" ", "_")
-        slug=slugnospace.lower()
-
-        # now write the sql query
-        print("(NULL, '1', '33', '", end = '')
-        print(filenoext, end = '') #Name
-        print("', '", end = '')
-        print(slug, end = '') #slug
-        print("', '", end = '')
-        print(htmlcontent, end = '')
-        print("', 'text_var', '0', NOW(), NOW(), '1', '1', '0', '0', 'markdown_var', '0', '0'),")
-
-        continue
-    else:
-        continue