roles/docker-friendica/README.md

@@ -1,61 +1,4 @@
 # role friendica
 
-## Delete all
-docker exec -i central-mariadb mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"; docker compose down; rm -rv /mnt/hdd/data/docker/volumes/friendica_data; docker volume rm friendica_data
-
-## Reset Database
-### Manual
-DROP DATABASE friendica;
-CREATE DATABASE friendica;
-exit;
-
-### Automatic
-DB_ROOT_PASSWORD="your_root_password"
-docker exec -i central-mariadb mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"
-
-## Enter application 
-
-docker compose exec -it application sh
-
-
-## debugging
-
-## Check environment variables
-docker compose exec -it application printenv
-
-ls -la /var/lib/docker/volumes/friendica_data/_data/
-
-## autoinstall
-docker compose exec --user www-data -it application bin/console autoinstall
-
-## reinitialisation
-
-### docker
-
-### full
-docker-compose up -d --force-recreate && sleep 2; docker compose exec --user www-data -it application bin/console autoinstall; 
-
-### info
-```bash 
-cat /var/lib/docker/volumes/friendica_data/_data/config/local.config.php
-## Check environment variables
-docker compose exec -it application printenv
-```
-## create user
-INSERT INTO user (guid, username, email, password, verified, register_date, account_expires_on, account_expired)
-VALUES (
-    UUID(), -- Generiert eine eindeutige Benutzer-ID
-    'newusername', -- Benutzername
-    'newuser@example.com', -- E-Mail-Adresse
-    MD5('newpassword'), -- Passwort (kann durch Bcrypt ersetzt werden, siehe unten)
-    1, -- Verifizierungsstatus (1 = verifiziert)
-    NOW(), -- Registrierungsdatum
-    '0001-01-01 00:00:00', -- Kontodauer unbegrenzt
-    0 -- Konto ist nicht abgelaufen
-);
-
-
-
 ## More information
-- https://hub.docker.com/_/friendica
-- https://wiki.friendi.ca/docs/install
+- https://hub.docker.com/_/friendica

roles/docker-friendica/templates/docker-compose.yml.j2

@@ -3,8 +3,8 @@ services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
 
   application:
-    image: friendica/server
-    restart: {{docker_restart_policy}}
+    image: friendica
+    restart: always
     volumes:
       - data:/var/www/html
     ports:
@@ -15,30 +15,19 @@ services:
       timeout: 10s
       retries: 3      
     environment:
-      FRIENDICA_URL: https://{{domain}}
-      HOSTNAME: {{domain}}
-      FRIENDICA_NO_VALIDATION: false
-      
-      # Debugging
-      FRIENDICA_DEBUGGING: false
-      # Database Configuration 
-      MYSQL_HOST: {{database_host}}:3306
-      MYSQL_DATABASE: {{database_name}}
-      MYSQL_USER: {{database_username}}
-      MYSQL_PASSWORD: {{database_password}}
-      SMTP: {{system_email_host}}
-      
-      # Email Configuration
-      SMTP_DOMAIN: {{ system_email_host }}
-      SMTP_PORT:  {{system_email_smtp_port}}
-      SMTP_AUTH_USER: {{system_email_username}}
-      SMTP_AUTH_PASS: {{system_email_password}}
-      SMTP_STARTTLS:  {{system_email_start_tls}}
-      SMTP_FROM:  {{system_email_username}}
-
-      # Administrator Credentials
-      FRIENDICA_ADMIN_MAIL: {{administrator_email}}
-      MAILNAME: {{administrator_email}}
+      - FRIENDICA_URL="https://{{domain}}"
+      - FRIENDICA_ADMIN_MAIL={{administrator_email}}
+      - MYSQL_HOST={{database_host}}:3306
+      - MYSQL_DATABASE={{database_name}}
+      - MYSQL_USER={{database_username}}
+      - MYSQL_PASSWORD={{database_password}}
+      - SMTP={{system_email_host}}
+      - SMTP_DOMAIN={{ system_email_host }}
+      - SMTP_PORT={{system_email_smtp_port}}
+      - SMTP_AUTH_USER={{system_email_username}}
+      - SMTP_AUTH_PASS={{system_email_password}}
+      - SMTP_STARTTLS={{system_email_start_tls}}
+      - SMTP_FROM={{system_email_username}}
 {% include 'templates/docker/container/networks.yml.j2' %}
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}