Update 'README.md'

README.md

@@ -6,7 +6,6 @@ This setup will allow you to quickly run and maintain a Pleroma instance.
 * Automatic Backup
 * Automatic Restore
 * Automatic Upgrades
-* Automatic install of SoapBoxFE
 * Daily Postgresql backups
 
 ### System Requirements
@@ -24,7 +23,7 @@ This setup will allow you to quickly run and maintain a Pleroma instance.
 
 ##### Modify the second to last line in ```pleroma/setup.sh```  with  your desired admin name
 
-##### Run ```get_pleroma.sh``` to get the latest Pleroma and SoapboxFE release
+##### Run ```get_pleroma.sh``` to get the latest Pleroma release
 
 ### Running with a low-memory machine? ###
 Here is the recommended changes to make at the bottom of ```postgresql/postgresql.conf```

docker-compose.yaml

@@ -5,6 +5,7 @@ services:
     restart: "always"
     volumes:
       - postgresql:/var/lib/postgresql/data
+      - ./saves:/saves
     networks:
       - pleroma
     privileged: true
@@ -15,7 +16,6 @@ services:
     volumes:
       - ./config:/etc/pleroma
       - ./var:/var/lib/pleroma
-      - ./saves:/saves
     ports:
       - "443:443"
     networks:

get_pleroma.sh

@@ -9,8 +9,8 @@ echo;echo "Downloading Latest Pleroma....";echo
 curl "https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=$arch-musl" -o pleroma/pleroma.zip
 
 
-echo;echo "Downloading Latest Soapbox Build.....";echo
-wget https://gitlab.com/`curl https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs | grep 'build-production' | cut -d "\"" -f4 | head -1`/artifacts/download -O pleroma/soapbox-fe.zip
+#echo;echo "Downloading Latest Soapbox Build.....";echo
+#wget https://gitlab.com/`curl https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs | grep 'build-production' | cut -d "\"" -f4 | head -1`/artifacts/download -O pleroma/soapbox-fe.zip
 
 echo;echo "Now you can build Pleroma with docker-compose build";echo
 

pleroma/Dockerfile

@@ -15,11 +15,11 @@ WORKDIR /opt
 COPY pleroma.zip /opt/
 
 WORKDIR /tmp
-COPY soapbox-fe.zip /tmp/
+#COPY soapbox-fe.zip /tmp/
 
 RUN mkdir -p /etc/pleroma;chown -R pleroma /etc/pleroma
 
-ADD default.conf /etc/nginx/conf.d/
+ADD default.conf /etc/nginx/http.d/
 ADD start.sh /
 ADD setup.sh /
 

pleroma/setup.sh

@@ -20,9 +20,9 @@ mkdir /var/run/nginx
 #Database Setup
 sleep 10
 export PGPASSWORD="sql"
-echo "CREATE EXTENSION IF NOT EXISTS citext;"| PGPASSWORD=sql psql -h postgresql -U pleroma 
-echo "CREATE EXTENSION IF NOT EXISTS pg_trgm;" | PGPASSWORD=sql psql -h postgresql -U pleroma
-echo "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";" | PGPASSWORD=sql psql -h postgresql -U pleroma
+echo "CREATE EXTENSION IF NOT EXISTS citext;"| PGPASSWORD=sql psql -h postgresql -U root pleroma 
+echo "CREATE EXTENSION IF NOT EXISTS pg_trgm;" | PGPASSWORD=sql psql -h postgresql -U root pleroma
+echo "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";" | PGPASSWORD=sql psql -h postgresql -U root pleroma
 su pleroma -s $SHELL -lc "/opt/pleroma/bin/pleroma_ctl migrate"
 
 #su pleroma -s $SHELL -lc "./bin/pleroma_ctl instance gen --output /etc/pleroma/config.exs --output-psql /tmp/setup_db.psql --force"

postgresql/backup.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-su postgres -s /bin/bash -lc "pg_dumpall -d pleroma --format=custom > /saves/pleroma-`date +%Y-%m-%d-%H-%M`.pgdump"
+su postgres -s /bin/bash -lc "pg_dump -d pleroma --format=custom > /saves/pleroma-`date +%Y-%m-%d-%H-%M`.pgdump"