From e2f85327fdc0638e1fed4d907449520879365b8a Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sun, 21 Jan 2024 14:15:12 -0800 Subject: [PATCH] updated bookstack --- bookstack/docker-compose.yml | 73 +++++++++++++++++------------------- bookstack/env-sample | 11 ------ bookstack/find-fix.html | 3 -- bookstack/txt2bookstack.py | 51 ------------------------- 4 files changed, 34 insertions(+), 104 deletions(-) delete mode 100644 bookstack/env-sample delete mode 100644 bookstack/find-fix.html delete mode 100644 bookstack/txt2bookstack.py diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index eec0c40..9b71f45 100644 --- a/bookstack/docker-compose.yml +++ b/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) -# you have to run the following in the container: -# php artisan bookstack:regenerate-permissions +# Sample .env # -# 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: - image: mariadb:${DB_V} + bookstack-db: + image: mariadb:latest # https://hub.docker.com/_/mariadb restart: always volumes: - - bookstack-db:/var/lib/mysql - networks: - - admin_web + - ./data/db:/var/lib/mysql + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" command: --max_allowed_packet=32505856 environment: - MYSQL_ROOT_PASSWORD: ${BOOKSTACK_MYSQL_ROOT_PASSWORD} - MYSQL_USER: bookstack - MYSQL_PASSWORD: ${BOOKSTACK_MYSQL_PASSWORD} - MYSQL_DATABASE: bookstack + MYSQL_ROOT_PASSWORD: ChangeThisToRandom + MYSQL_USER: ${DB_USER} + MYSQL_PASSWORD: ${DB_PASSWORD} + 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_DATABASE=bookstack - - DB_USERNAME=bookstack - - DB_PASSWORD=${BOOKSTACK_MYSQL_PASSWORD} - - APP_URL=https://${BOOKSTACK_DOMAIN_NAME} - networks: - - admin_web + - DB_HOST=bookstack-db:3306 + - DB_DATABASE=${DB_USER} + - DB_USERNAME=${DB_USER} + - DB_PASSWORD=${DB_PASSWORD} + - APP_URL=${APP_URL:-http://localhost:8248} + - REVISION_LIMIT=false + - APP_KEY=${APP_KEY} + - APP_TIMEZONE=America/Vancouver volumes: - - bookstack-uploads:/var/www/bookstack/public/uploads - - bookstack-storage:/var/www/bookstack/storage/uploads - labels: - - "traefik.enable=true" - - "traefik.http.routers.${PREFIX}_bookstack.rule=Host(`${BOOKSTACK_DOMAIN_NAME}`)" - - "traefik.http.routers.${PREFIX}_bookstack.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_bookstack.tls.certresolver=letsencrypt" - - "traefik.http.services.${PREFIX}_bookstack.loadbalancer.server.port=8080" + - ./data/uploads:/var/www/bookstack/public/uploads + - ./data/storage:/var/www/bookstack/storage/uploads + - ./php.ini:/usr/local/etc/php/php.ini + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" + ports: + - "8248:8080" + diff --git a/bookstack/env-sample b/bookstack/env-sample deleted file mode 100644 index 90136a0..0000000 --- a/bookstack/env-sample +++ /dev/null @@ -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 diff --git a/bookstack/find-fix.html b/bookstack/find-fix.html deleted file mode 100644 index 1a97702..0000000 --- a/bookstack/find-fix.html +++ /dev/null @@ -1,3 +0,0 @@ -

- SELECT CONCAT( '

  • ',slug,'
    • ') FROM `pages` WHERE `text` LIKE 'text_var' ORDER BY `id` DESC -

    diff --git a/bookstack/txt2bookstack.py b/bookstack/txt2bookstack.py deleted file mode 100644 index 76298bc..0000000 --- a/bookstack/txt2bookstack.py +++ /dev/null @@ -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', '
    ').replace('\n', '
    ') - 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