vst
/
env
2
1
Fork 0
Code Issues 19 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: vst:a2f2c3817ef9641a06f940b4b6a7d1fc3d0c14cc
Branches Tags
vst:single-dockerfile
..
compare: vst:4084e6601fd52cb16e660a3c6c3ebc8609dab90c
Branches Tags
vst:single-dockerfile

No commits in common. 'a2f2c3817ef9641a06f940b4b6a7d1fc3d0c14cc' and '4084e6601fd52cb16e660a3c6c3ebc8609dab90c' have entirely different histories.
a2f2c3817e ... 4084e6601f

4 changed files with 10 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 34
      Makefile
  2. 4
      mastodon.yaml
  3. 4
      matrix.yaml
  4. 1
      nginx/default.conf

34
Makefile
Unescape View File

@ -10,7 +10,7 @@ MODULES += mobilizon
MODULES += gitea MODULES += gitea
MODULES += nitter MODULES += nitter
MODULES += pixelfed MODULES += pixelfed
#MODULES += bookwyrm MODULES += bookwyrm
include env.production include env.production
domain_name := $(DOMAIN_NAME) domain_name := $(DOMAIN_NAME)
@ -37,9 +37,9 @@ down:
nginx-shell: nginx-shell:
$(DOCKER) exec nginx sh $(DOCKER) exec nginx sh
nginx-logs: nginx-logs:
$(DOCKER) logs -f --tail 100000 nginx $(DOCKER) logs -f --tail 1000 nginx
mastodon-logs: mastodon-logs:
$(DOCKER) logs -f --tail 1000 mastodon mastodon-sidekiq mastodon-streaming mastodon-es mastodon-db $(DOCKER) logs -f --tail 1000 mastodon mastodon-sidekiq
grafana-shell: grafana-shell:
$(DOCKER) exec grafana bash $(DOCKER) exec grafana bash
hedgedoc-shell: hedgedoc-shell:
@ -56,36 +56,20 @@ mastodon-restart:
$(DOCKER) restart mastodon $(DOCKER) restart mastodon
mastodon-shell: mastodon-shell:
$(DOCKER) exec mastodon bash $(DOCKER) exec mastodon bash
mastodon-worker-shell: mastodon-streaming-shell:
$(DOCKER) exec mastodon-worker bash $(DOCKER) exec mastodon-streaming bash
matrix-shell: matrix-shell:
$(DOCKER) exec matrix-synapse bash $(DOCKER) exec matrix-synapse bash
nextcloud-shell: nextcloud-shell:
$(DOCKER) exec nextcloud bash $(DOCKER) exec nextcloud bash
matrix-logs: matrix-logs:
$(DOCKER) logs --tail 100 -f matrix-synapse $(DOCKER) logs --tail 100 -f matrix-synapse
pixelfed-shell:
$(DOCKER) exec pixelfed-app bash
pixelfed-worker-shell:
$(DOCKER) exec pixelfed-worker bash
pixelfed-logs:
$(DOCKER) logs --tail 100 -f pixelfed-app pixelfed-worker pixelfed-db pixelfed-redis
pixelfed-worker-logs:
$(DOCKER) logs --tail 100 -f pixelfed-worker
pixelfed-rebuild:
$(DOCKER) build pixelfed-app pixelfed-worker pixelfed-redis pixelfed-db
pixelfed-restart:
$(DOCKER) restart pixelfed-app pixelfed-worker pixelfed-redis pixelfed-db
pixelfed-down:
$(DOCKER) stop pixelfed-app pixelfed-worker pixelfed-redis pixelfed-db
mastodon-sidekiq-logs: mastodon-sidekiq-logs:
$(DOCKER) logs --tail 100 -f mastodon-sidekiq $(DOCKER) logs --tail 100 -f mastodon-sidekiq
nextcloud-logs: nextcloud-logs:
$(DOCKER) logs -f nextcloud $(DOCKER) logs -f nextcloud
nginx-build: secrets/nginx nginx-build: secrets/nginx
$(DOCKER) build nginx $(DOCKER) build nginx
bookwyrm-restart:
$(DOCKER) restart bookwyrm-db bookwyrm-redis_activity bookwyrm-redis_broker bookwyrm-web bookwyrm-celery_worker bookwyrm-celery_beat bookwyrm-flower
certdir = ./data/certbot/conf/live/${DOMAIN_NAME} certdir = ./data/certbot/conf/live/${DOMAIN_NAME}
@ -146,14 +130,6 @@ nginx-reload:
$(DOCKER) restart nginx $(DOCKER) restart nginx
nextcloud-restart: nextcloud-restart:
$(DOCKER) restart nextcloud $(DOCKER) restart nextcloud
mastodon-rebuild:
$(DOCKER) create mastodon mastodon-sidekiq
mastodon-restart:
$(DOCKER) restart mastodon mastodon-sidekiq mastodon-db mastodon-streaming mastodon-redis mastodon-es
mastodon-cache:
$(DOCKER) exec mastodon bin/tootctl media remove
matrix-restart:
$(DOCKER) restart matrix-synapse matrix-element
config: config:

4
mastodon.yaml
Unescape View File

@ -66,7 +66,7 @@ services:
hard: -1 hard: -1
mastodon: mastodon:
image: tootsuite/mastodon:v3.5.9 image: tootsuite/mastodon
container_name: mastodon container_name: mastodon
restart: always restart: always
#command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 6001" #command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 6001"
@ -140,7 +140,7 @@ services:
- mastodon-redis - mastodon-redis
mastodon-sidekiq: mastodon-sidekiq:
image: tootsuite/mastodon:v3.5.9 image: tootsuite/mastodon
restart: always restart: always
container_name: mastodon-sidekiq container_name: mastodon-sidekiq
env_file: env_file:

4
matrix.yaml
Unescape View File

@ -12,7 +12,7 @@ services:
# - POSTGRES_PASSWORD=STRONGPASSWORD # - POSTGRES_PASSWORD=STRONGPASSWORD
matrix-element: matrix-element:
image: vectorim/element-web:v1.11.35 image: vectorim/element-web:latest
restart: unless-stopped restart: unless-stopped
container_name: matrix-element container_name: matrix-element
volumes: volumes:
@ -26,7 +26,7 @@ services:
# - "5000:80" # - "5000:80"
matrix-synapse: matrix-synapse:
image: matrixdotorg/synapse:v1.87.0 image: matrixdotorg/synapse:latest
restart: unless-stopped restart: unless-stopped
container_name: matrix-synapse container_name: matrix-synapse
volumes: volumes:

1
nginx/default.conf
Unescape View File

@ -45,6 +45,7 @@ server {
<body> <body>
<h1>Unknown hostname "$host"</h1> <h1>Unknown hostname "$host"</h1>
<p>Try <a href="https://${DOMAIN_NAME}/">${DOMAIN_NAME}</a> instead <p>Try <a href="https://${DOMAIN_NAME}/">${DOMAIN_NAME}</a> instead
<p>Sub-sites enabled: ${MODULES}
<pre style="white-space: pre-wrap"> <pre style="white-space: pre-wrap">
$request $request

Write Preview
Loading…
Cancel
Save