logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 211920b622aba0d7c9200dabd8e2d011476333c4
parent: 01d800386716748d9343c9dafd62953ab0af2cf3
Author: Eugen <eugen@zeonfederated.com>
Date:   Sat,  8 Apr 2017 12:25:23 +0200

Revert "add persistance to Postresql container" (#1251)


Diffstat:

Mdocker-compose.yml4----
Mdocs/Using-Mastodon/List-of-Mastodon-instances.md2--
2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml @@ -3,13 +3,9 @@ services: db: restart: always image: postgres:alpine - volumes: - - ./postgres-data:/var/lib/postgresql/data redis: restart: always image: redis:alpine - volumes: - - ./redis:/data web: restart: always build: . diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -45,8 +45,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No| | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| -| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| -| [mastodon.cloud](https://mastodon.cloud)|Open Mastodon instance with people from everywhere.|Yes|Yes| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No| | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes| | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes|