diff --git a/bookstack/sample.env b/bookstack/sample.env index 8cb6a6f..9500d5b 100644 --- a/bookstack/sample.env +++ b/bookstack/sample.env @@ -1,6 +1,8 @@ COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks +VOL_CONFIG_PATH=./config #HELP: configpath +VOL_PATH=./data #HELP: volpath -# bookstack +# Bookstack BOOKSTACK_APP_KEY=APP_KEY #HELP: gen32 BOOKSTACK_APP_TIMEZONE=America/Vancouver BOOKSTACK_APP_URL=http://localhost:8248 @@ -10,5 +12,3 @@ BOOKSTACK_DB_PASSWORD=dbpass #HELP: gen32 BOOKSTACK_DB_USERNAME=dbuser BOOKSTACK_IMAGE=solidnerd/bookstack:latest BOOKSTACK_REVISION_LIMIT=false -VOL_CONFIG_PATH=./config #HELP: configpath -VOL_PATH=./data #HELP: volpath diff --git a/monica/README.md b/monica/README.md new file mode 100644 index 0000000..e23411c --- /dev/null +++ b/monica/README.md @@ -0,0 +1,22 @@ +# Monica Personal CRM + +Last Updated: Thu August 08, 2024 14:51:09 PDT + +## Overview + +Docker Hub: https://hub.docker.com/_/monica +Project: https://www.monicahq.com/ +Proxy Port: 9000 + +## Description + +Personal Customer Relationship Manager + +## Notes + +Importing directly to the db (phpmydadmin) +you have to run the following in the container: ```php artisan bookstack:regenerate-permissions``` + +### Sample ENV + +https://raw.githubusercontent.com/monicahq/monica/master/.env.example diff --git a/monica/docker-compose.yml b/monica/docker-compose.yml index ce8ca5d..7acfd7f 100644 --- a/monica/docker-compose.yml +++ b/monica/docker-compose.yml @@ -1,48 +1,13 @@ -################################################################################ -# MONICA_ -# TODO: this isn't working, it won't grab the DB host name -# I think you have to build it with the env file -# -# 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 -# -# Version 1 -################################################################################ -version: "3.4" - -volumes: - monica-db: - monica: - -networks: - admin_web: - external: - name: admin_web +version: '3.8' services: - monica-db: - image: mariadb:latest - restart: unless-stopped - volumes: - - ./data/monica-db:/var/lib/mysql - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed - environment: - MYSQL_ROOT_PASSWORD: changeme - MYSQL_USER: monica - MYSQL_PASSWORD: changeme - MYSQL_DATABASE: monica - monica: - image: monica:latest + image: ${MONICA_IMAGE:-latest} restart: unless-stopped - volumes: - - ./data/monica:/var/www/html/storage environment: - DB_HOST: monica-db - DB_USERNAME: monica - DB_PASSWORD: changeme - APP_ENV: production \ No newline at end of file + - DB_HOST=${MONICA_DB_HOST:-monica-db} + - DB_USERNAME=${MONICA_DB_USERNAME:-monica} + - DB_PASSWORD=${MONICA_DB_PASSWORD:-changeme} + - APP_ENV=${MONICA_APP_ENV:-production} + volumes: + - ${VOL_PATH}/monica:/var/www/html/storage diff --git a/monica/env-sample b/monica/env-sample deleted file mode 100644 index 7056171..0000000 --- a/monica/env-sample +++ /dev/null @@ -1,180 +0,0 @@ -# Grab the defaul env here: -# https://raw.githubusercontent.com/monicahq/monica/master/.env.example - -# Two choices: local|production. Use local if you want to install Monica as a -# development version. Use production otherwise. -APP_ENV=production - -# true if you want to show debug information on errors. For production, put this -# to false. -APP_DEBUG=true - -# The encryption key. This is the most important part of the application. Keep -# this secure otherwise, everyone will be able to access your application. -# Must be 32 characters long exactly. -# Use `php artisan key:generate` or `pwgen -s 32 1` to generate a random key. -APP_KEY=tIUqHiirV6wQ9uPRPy7IV2YNELovDgnr - -# Prevent information leakage by referring to IDs with hashIds instead of -# the actual IDs used in the database. -HASH_SALT=ABCDEeMeBy20+KeyLength -HASH_LENGTH=18 - -# The URL of your application. -APP_URL=http://localhost - -# Database information -# To keep this information secure, we urge you to change the default password -DB_CONNECTION=mysql -DB_HOST=p1_monica-db_1 -DB_PORT=3306 -# You can use mysql unix socket if available, it overrides DB_HOST and DB_PORT values. -#DB_UNIX_SOCKET=/var/run/mysqld/mysqld.sock -DB_DATABASE=monica -DB_USERNAME=homestead -DB_PASSWORD=Again2ASecurepass! -DB_PREFIX= -DB_TEST_HOST=p1_monica-db_1 -DB_TEST_DATABASE=monica_test -DB_TEST_USERNAME=homestead -DB_TEST_PASSWORD=Again2ASecurepass! - -# Use utf8mb4 database charset format to support emoji characters -# ⚠ be sure your DBMS supports utf8mb4 format -DB_USE_UTF8MB4=true - -# Mail credentials used to send emails from the application. -MAIL_MAILER=smtp -MAIL_HOST=mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME= -MAIL_PASSWORD= -MAIL_ENCRYPTION= -# Outgoing emails will be sent with these identity -MAIL_FROM_ADDRESS= -MAIL_FROM_NAME="Monica instance" -# New registration notification sent to this email -APP_EMAIL_NEW_USERS_NOTIFICATION= - -# Ability to disable signups on your instance. -# Can be true or false. Default to false. -APP_DISABLE_SIGNUP=true - -# Enable user email verification. -APP_SIGNUP_DOUBLE_OPTIN=false - -# Set trusted proxy IP addresses. -# To trust all proxies that connect directly to your server, use a "*". -# To trust one or more specific proxies that connect directly to your server, -# use a comma separated list of IP addresses. -APP_TRUSTED_PROXIES= - -# Enable automatic cloudflare trusted proxy discover -APP_TRUSTED_CLOUDFLARE=false - -# Frequency of creation of new log files. Logs are written when an error occurs. -# Refer to config/logging.php for the possible values. -LOG_CHANNEL=daily - -# Error tracking. Specific to hosted version on .com. You probably don't need -# those. -SENTRY_SUPPORT=false -SENTRY_LARAVEL_DSN= - -# Send a daily ping to https://version.monicahq.com to check if a new version -# is available. When a new version is detected, you will have a message in the -# UI, as well as the release notes for the new changes. Can be true or false. -# Default to true. -CHECK_VERSION=true - -# Cache, session, and queue parameters -# ⚠ Change this only if you know what you are doing -#. Cache: database, file, memcached, redis, dynamodb -#. Session: file, cookie, database, apc, memcached, redis, array -#. Queue: sync, database, beanstalkd, sqs, redis -# If Queue is not set to 'sync', you'll have to set a queue worker -# See https://laravel.com/docs/5.7/queues#running-the-queue-worker -CACHE_DRIVER=database -SESSION_DRIVER=file -SESSION_LIFETIME=120 -QUEUE_CONNECTION=sync - -# If you use redis, set the redis host or ip, like: -#REDIS_HOST=redis - -# Maximum allowed size for uploaded files, in kilobytes. -# Make sure this is an integer, without commas or spaces. -DEFAULT_MAX_UPLOAD_SIZE=10240 - -# Maximum allowed storage size per account, in megabytes. -# Make sure this is an integer, without commas or spaces. -DEFAULT_MAX_STORAGE_SIZE=512 - -# Default filesystem to store uploaded files. -# Possible values: public|s3 -DEFAULT_FILESYSTEM=public - -# AWS keys for S3 when using this storage method -AWS_KEY= -AWS_SECRET= -AWS_REGION=us-east-1 -AWS_BUCKET= -AWS_SERVER= - -# Allow Two Factor Authentication feature on your instance -MFA_ENABLED=true - -# Enable DAV support -DAV_ENABLED=true - -# CLIENT ID and SECRET used for the official mobile application -# This is to make sure that only the mobile application that you approve can -# access the route to let your users sign in with their credentials -# Note: the official mobile application is not currently available on the stores. -MOBILE_CLIENT_ID= -MOBILE_CLIENT_SECRET= - -# Allow to access general statistics about your instance through a public API -# call -ALLOW_STATISTICS_THROUGH_PUBLIC_API_ACCESS=false - -# Indicates that each user in the instance must comply to international policies -# like CASL or GDPR -POLICY_COMPLIANT=true - -# Enable geolocation services -# This is used to translate addresses to GPS coordinates. -ENABLE_GEOLOCATION=false - -# API key for geolocation services -# We use LocationIQ (https://locationiq.com/) to translate addresses to -# latitude/longitude coordinates. We could use Google instead but we don't -# want to give anything to Google, ever. -# LocationIQ offers 10,000 free requests per day. -LOCATION_IQ_API_KEY= - -# Enable weather on contact profile page -# Weather can only be fetched if we know longitude/latitude - this is why -# you also need to activate the geolocation service above to make it work -ENABLE_WEATHER=false - -# Access to weather data from darksky api -# https://darksky.net/dev/register -# Darksky provides an api with 1000 free API calls per day -# You need to enable the weather above if you provide an API key here. -DARKSKY_API_KEY= - - -################################################################################# - -# Domains & Project -PREFIX=p1 -MONICA_DOMAIN_NAME=family.nickyeoman.com - -# Passwords -MONICA_MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass! -MONICA_MYSQL_PASSWORD=Again2ASecurepass! - -# Software versions -DB_V=10.4.11 -MONICA_V=v2.17.0 diff --git a/monica/sample-extends.yml b/monica/sample-extends.yml new file mode 100644 index 0000000..a336d7f --- /dev/null +++ b/monica/sample-extends.yml @@ -0,0 +1,14 @@ +version: '3.4' + +services: + monica: + extends: + file: ${COOKBOOK}/monica/docker-compose.yml + service: monica + + monica-db: + extends: + file: ${COOKBOOK}/mariadb/docker-compose.yml + service: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed + \ No newline at end of file diff --git a/monica/sample.env b/monica/sample.env new file mode 100644 index 0000000..e9e60c6 --- /dev/null +++ b/monica/sample.env @@ -0,0 +1,10 @@ + +COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks +VOL_PATH=./data #HELP: volpath + +# Monica +MONICA_IMAGE=monica:latest +MONICA_DB_HOST=monica-db +MONICA_DB_USERNAME=monica +MONICA_DB_PASSWORD=changeme +MONICA_APP_ENV=production diff --git a/piwigo/sample-extends.yml b/piwigo/sample-extends.yml index 6795d27..b7b1637 100644 --- a/piwigo/sample-extends.yml +++ b/piwigo/sample-extends.yml @@ -6,9 +6,9 @@ services: file: ${COOKBOOK}/piwigo/docker-compose.yml service: piwigo -piwigo-db: - extends: - file: ${COOKBOOK}/mariadb/docker-compose.yml - service: mariadb - command: --max_allowed_packet=32505856 - \ No newline at end of file + piwigo-db: + extends: + file: ${COOKBOOK}/mariadb/docker-compose.yml + service: mariadb + command: --max_allowed_packet=32505856 + \ No newline at end of file