From e3041f2df6245beaa0f9a4e1880dd5c81b0f5f11 Mon Sep 17 00:00:00 2001 From: Gael Date: Mon, 8 Sep 2025 01:38:43 +0200 Subject: [PATCH] Pb fin de lignes windows ... --- config/orgaTmpl/orga-gen.sh | 9 +- config/orgaTmpl/secret.tmpl/env-castopodAdmin | 4 +- config/orgaTmpl/secret.tmpl/env-spipDB | 6 +- config/orgaTmpl/secret.tmpl/env-spipServ | 20 ++--- dockers/spip/docker-compose.yml | 84 +++++++++---------- secret.tmpl/env-borg | 32 +++---- secret.tmpl/env-castopodAdmin | 4 +- secret.tmpl/env-castopodDB | 5 +- secret.tmpl/env-kaz | 20 ++--- secret.tmpl/env-mail | 2 +- secret.tmpl/env-mattermostAdmin | 6 +- secret.tmpl/env-paheko | 2 +- secret.tmpl/env-peertubeDB | 14 ++-- secret.tmpl/env-peertubeServ | 62 +++++++------- secret.tmpl/env-spipDB | 6 +- secret.tmpl/env-spipServ | 20 ++--- secret.tmpl/env-traefik | 2 +- 17 files changed, 152 insertions(+), 146 deletions(-) diff --git a/config/orgaTmpl/orga-gen.sh b/config/orgaTmpl/orga-gen.sh index 590ce28..e47f2b5 100755 --- a/config/orgaTmpl/orga-gen.sh +++ b/config/orgaTmpl/orga-gen.sh @@ -194,9 +194,12 @@ for ARG in "$@"; do '-wp' | '-word'* ) wp="off" ;; - '-pod' | '-casto'* ) - castopod="off" - ;; + '-pod' | '-casto'* ) + castopod="off" + ;; + '-spip' ) + spip="off" + ;; '+paheko' ) paheko="on" ;; diff --git a/config/orgaTmpl/secret.tmpl/env-castopodAdmin b/config/orgaTmpl/secret.tmpl/env-castopodAdmin index 1b822a4..4429e86 100644 --- a/config/orgaTmpl/secret.tmpl/env-castopodAdmin +++ b/config/orgaTmpl/secret.tmpl/env-castopodAdmin @@ -1,3 +1,3 @@ -ADMIN_USER=@@pass@@castopod2@@p@@ -ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ +ADMIN_USER=@@pass@@castopod2@@p@@ +ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ ADMIN_PASSWORD=@@pass@@castopod3@@p@@ \ No newline at end of file diff --git a/config/orgaTmpl/secret.tmpl/env-spipDB b/config/orgaTmpl/secret.tmpl/env-spipDB index 9fb0767..a747182 100644 --- a/config/orgaTmpl/secret.tmpl/env-spipDB +++ b/config/orgaTmpl/secret.tmpl/env-spipDB @@ -1,4 +1,4 @@ -MYSQL_ROOT_PASSWORD=@@pass@@rootdb@@p@@ -MYSQL_DATABASE=@@db@@spip@@d@@ -MYSQL_USER=@@user@@spip@@u@@ +MYSQL_ROOT_PASSWORD=@@pass@@rootdb@@p@@ +MYSQL_DATABASE=@@db@@spip@@d@@ +MYSQL_USER=@@user@@spip@@u@@ MYSQL_PASSWORD=@@pass@@spip@@p@@ \ No newline at end of file diff --git a/config/orgaTmpl/secret.tmpl/env-spipServ b/config/orgaTmpl/secret.tmpl/env-spipServ index 2df5105..399432b 100644 --- a/config/orgaTmpl/secret.tmpl/env-spipServ +++ b/config/orgaTmpl/secret.tmpl/env-spipServ @@ -1,10 +1,10 @@ -SPIP_AUTO_INSTALL=1 -SPIP_DB_SERVER=mysql -SPIP_DB_NAME=@@db@@spip@@d@@ -SPIP_DB_LOGIN=@@user@@spip@@u@@ -SPIP_DB_PASS=@@pass@@spip@@p@@ -SPIP_ADMIN_NAME=admin -SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ -SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ -SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ -PHP_TIMEZONE=Europe/Paris +SPIP_AUTO_INSTALL=1 +SPIP_DB_SERVER=mysql +SPIP_DB_NAME=@@db@@spip@@d@@ +SPIP_DB_LOGIN=@@user@@spip@@u@@ +SPIP_DB_PASS=@@pass@@spip@@p@@ +SPIP_ADMIN_NAME=admin +SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ +SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ +SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ +PHP_TIMEZONE=Europe/Paris diff --git a/dockers/spip/docker-compose.yml b/dockers/spip/docker-compose.yml index 9da59ba..0e68813 100644 --- a/dockers/spip/docker-compose.yml +++ b/dockers/spip/docker-compose.yml @@ -1,42 +1,42 @@ -services: - db: - image: mariadb:11.4 - container_name: ${spipDBName} - restart: ${restartPolicy} - env_file: - - ../../secret/env-${spipDBName} - volumes: - - spipDB:/var/lib/mysql - networks: - - spipNet - - spip: - image: ipeos/spip:4.4 - restart: ${restartPolicy} - container_name: ${spipServName} - env_file: - - ../../secret/env-${spipServName} - links: - - db:mysql - environment: - - SPIP_AUTO_INSTALL=1 - - SPIP_DB_HOST=${spipDBName} - - SPIP_SITE_ADDRESS=https://${spipHost}.${domain} - expose: - - 80 - labels: - - "traefik.enable=true" - - "traefik.http.routers.${spipServName}.rule=Host(`${spipHost}.${domain}`)" - networks: - - spipNet - volumes: - - spipData:/usr/src/spip - -volumes: - spipDB: - spipData: - -networks: - spipNet: - external: true - name: spipNet +services: + db: + image: mariadb:11.4 + container_name: ${spipDBName} + restart: ${restartPolicy} + env_file: + - ../../secret/env-${spipDBName} + volumes: + - spipDB:/var/lib/mysql + networks: + - spipNet + + spip: + image: ipeos/spip:4.4 + restart: ${restartPolicy} + container_name: ${spipServName} + env_file: + - ../../secret/env-${spipServName} + links: + - db:mysql + environment: + - SPIP_AUTO_INSTALL=1 + - SPIP_DB_HOST=${spipDBName} + - SPIP_SITE_ADDRESS=https://${spipHost}.${domain} + expose: + - 80 + labels: + - "traefik.enable=true" + - "traefik.http.routers.${spipServName}.rule=Host(`${spipHost}.${domain}`)" + networks: + - spipNet + volumes: + - spipData:/usr/src/spip + +volumes: + spipDB: + spipData: + +networks: + spipNet: + external: true + name: spipNet diff --git a/secret.tmpl/env-borg b/secret.tmpl/env-borg index 71acae0..ecb8480 100644 --- a/secret.tmpl/env-borg +++ b/secret.tmpl/env-borg @@ -1,17 +1,17 @@ -borg_VOLUME_SAUVEGARDES= -borg_BORG_REPO= -borg_BORG_PASSPHRASE=@@token@@borg@@t@@ -borg_BORGLOG="/var/log/borg" -borg_BORG_FIC_DEL="/tmp/sauvegarde_supp.txt" -borg_BORG_EXCLUDE_BACKUP= -borg_MAIL_RAPPORT=a@@@globalvar@@domain@@gv@@;b@@@globalvar@@domain@@gv@@;c@@@globalvar@@domain@@gv@@ -borg_LISTREPSAUV= -borg_BORGMOUNT="/mnt/repo_borg" -borg_MAILOK= -borg_MAILWARNING= -borg_MAILDETAIL= -borg_BACKUPS_KEEP="4m" -borg_NB_BACKUPS_JOUR=90 -borg_NB_BACKUPS_SEM=30 -borg_NB_BACKUPS_MOIS=12 +borg_VOLUME_SAUVEGARDES= +borg_BORG_REPO= +borg_BORG_PASSPHRASE=@@token@@borg@@t@@ +borg_BORGLOG="/var/log/borg" +borg_BORG_FIC_DEL="/tmp/sauvegarde_supp.txt" +borg_BORG_EXCLUDE_BACKUP= +borg_MAIL_RAPPORT=a@@@globalvar@@domain@@gv@@;b@@@globalvar@@domain@@gv@@;c@@@globalvar@@domain@@gv@@ +borg_LISTREPSAUV= +borg_BORGMOUNT="/mnt/repo_borg" +borg_MAILOK= +borg_MAILWARNING= +borg_MAILDETAIL= +borg_BACKUPS_KEEP="4m" +borg_NB_BACKUPS_JOUR=90 +borg_NB_BACKUPS_SEM=30 +borg_NB_BACKUPS_MOIS=12 borg_BORGSCRIPTS=/root/borgscripts \ No newline at end of file diff --git a/secret.tmpl/env-castopodAdmin b/secret.tmpl/env-castopodAdmin index 1b822a4..4429e86 100644 --- a/secret.tmpl/env-castopodAdmin +++ b/secret.tmpl/env-castopodAdmin @@ -1,3 +1,3 @@ -ADMIN_USER=@@pass@@castopod2@@p@@ -ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ +ADMIN_USER=@@pass@@castopod2@@p@@ +ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ ADMIN_PASSWORD=@@pass@@castopod3@@p@@ \ No newline at end of file diff --git a/secret.tmpl/env-castopodDB b/secret.tmpl/env-castopodDB index d812df6..9cc0768 100644 --- a/secret.tmpl/env-castopodDB +++ b/secret.tmpl/env-castopodDB @@ -1,4 +1,7 @@ MYSQL_ROOT_PASSWORD=@@pass@@castopod@@p@@ MYSQL_USER=@@user@@castopod1@@u@@ MYSQL_PASSWORD=@@pass@@castopod1@@p@@ -MYSQL_DATABASE=@@db@@castopod1@@d@@ \ No newline at end of file +MYSQL_DATABASE=@@db@@castopod1@@d@@ +CP_DATABASE_NAME=@@db@@castopod1@@d@@ +CP_DATABASE_USERNAME=@@user@@castopod1@@u@@ +CP_DATABASE_PASSWORD=@@pass@@castopod1@@p@@ diff --git a/secret.tmpl/env-kaz b/secret.tmpl/env-kaz index 330188f..ba565f1 100644 --- a/secret.tmpl/env-kaz +++ b/secret.tmpl/env-kaz @@ -1,11 +1,11 @@ -# tout est dans le env_kaz -# utilisé par gest containers -NAS_VOL= -OPERATE_ON_MAIN= # par defaut NON on ne traite que des orgas -OPERATE_ON_NAS_ORGA= # par defaut NON, on va aussi sur les orgas du NAS -OPERATE_LOCAL_ORGA="OUI" # par defaut oui -TEMPO_ACTION_STOP=2 # Lors de redémarrage avec tempo, on attend après le stop -TEMPO_ACTION_START=60 # Lors de redémarrage avec tempo, avant de reload le proxy -DEFAULTCONTAINERS="cloud agora wp wiki office paheko castopod spip" -APPLIS_PAR_DEFAUT="tasks calendar contacts bookmarks mail richdocuments external drawio snappymail ransomware_protection" #rainloop richdocumentscode +# tout est dans le env_kaz +# utilisé par gest containers +NAS_VOL= +OPERATE_ON_MAIN= # par defaut NON on ne traite que des orgas +OPERATE_ON_NAS_ORGA= # par defaut NON, on va aussi sur les orgas du NAS +OPERATE_LOCAL_ORGA="OUI" # par defaut oui +TEMPO_ACTION_STOP=2 # Lors de redémarrage avec tempo, on attend après le stop +TEMPO_ACTION_START=60 # Lors de redémarrage avec tempo, avant de reload le proxy +DEFAULTCONTAINERS="cloud agora wp wiki office paheko castopod spip" +APPLIS_PAR_DEFAUT="tasks calendar contacts bookmarks mail richdocuments external drawio snappymail ransomware_protection" #rainloop richdocumentscode QUIET="1" # redirection des echo \ No newline at end of file diff --git a/secret.tmpl/env-mail b/secret.tmpl/env-mail index 5ce464e..31063c1 100644 --- a/secret.tmpl/env-mail +++ b/secret.tmpl/env-mail @@ -1,2 +1,2 @@ -service_mail=admin@@@globalvar@@domain@@gv@@ +service_mail=admin@@@globalvar@@domain@@gv@@ service_password=@@pass@@servicemail@@p@@ \ No newline at end of file diff --git a/secret.tmpl/env-mattermostAdmin b/secret.tmpl/env-mattermostAdmin index 5c41c36..7b36cc8 100644 --- a/secret.tmpl/env-mattermostAdmin +++ b/secret.tmpl/env-mattermostAdmin @@ -1,4 +1,4 @@ - -mattermost_user=@@user@@mattermost2@@u@@ -mattermost_pass=@@pass@@mattermost2@@p@@ + +mattermost_user=@@user@@mattermost2@@u@@ +mattermost_pass=@@pass@@mattermost2@@p@@ mattermost_token=@@token@@mattermost@@t@@ \ No newline at end of file diff --git a/secret.tmpl/env-paheko b/secret.tmpl/env-paheko index 5594214..59f7dd6 100644 --- a/secret.tmpl/env-paheko +++ b/secret.tmpl/env-paheko @@ -1,2 +1,2 @@ -API_USER=@@user@@pahekoapi@@u@@ +API_USER=@@user@@pahekoapi@@u@@ API_PASSWORD=@@pass@@pahekoapi@@p@@ \ No newline at end of file diff --git a/secret.tmpl/env-peertubeDB b/secret.tmpl/env-peertubeDB index 8aaeb43..53ad97d 100644 --- a/secret.tmpl/env-peertubeDB +++ b/secret.tmpl/env-peertubeDB @@ -1,8 +1,8 @@ -POSTGRES_USER=@@user@@peertube@@u@@ -POSTGRES_PASSWORD=@@pass@@peertube@@p@@ -POSTGRES_DB=@@db@@peertube@@d@@ - -PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ -PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ -PEERTUBE_DB_SSL=false +POSTGRES_USER=@@user@@peertube@@u@@ +POSTGRES_PASSWORD=@@pass@@peertube@@p@@ +POSTGRES_DB=@@db@@peertube@@d@@ + +PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ +PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ +PEERTUBE_DB_SSL=false PEERTUBE_DB_HOSTNAME=peertubeDB \ No newline at end of file diff --git a/secret.tmpl/env-peertubeServ b/secret.tmpl/env-peertubeServ index ed16e7b..312b058 100644 --- a/secret.tmpl/env-peertubeServ +++ b/secret.tmpl/env-peertubeServ @@ -1,32 +1,32 @@ -POSTGRES_USER=@@user@@peertube@@u@@ -POSTGRES_PASSWORD=@@pass@@peertube@@p@@ -POSTGRES_DB=@@db@@peertube@@d@@ - -PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ -PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ -PEERTUBE_DB_SSL=false -PEERTUBE_DB_HOSTNAME=peertubeDB - -PEERTUBE_WEBSERVER_HOSTNAME=@@globalvar@@peertubeHost@@gv@@.@@globalvar@@domain@@gv@@ -PEERTUBE_TRUST_PROXY=['10.0.0.0/8', '127.0.0.1', 'loopback', '172.18.0.0/16'] - -PEERTUBE_SECRET=@@token@@peertube@@t@@ -PT_INITIAL_ROOT_PASSWORD=@@pass@@peertubeinitialroot@@p@@ - -#PEERTUBE_SMTP_USERNAME= -#PEERTUBE_SMTP_PASSWORD= -# Default to Postfix service name "postfix" in docker-compose.yml -# May be the hostname of your Custom SMTP server -PEERTUBE_SMTP_HOSTNAME=smtp.kaz.bzh -PEERTUBE_SMTP_PORT=25 -PEERTUBE_SMTP_FROM= -PEERTUBE_SMTP_TLS=false -PEERTUBE_SMTP_DISABLE_STARTTLS=false -PEERTUBE_ADMIN_EMAIL= - -POSTFIX_myhostname= -#OPENDKIM_DOMAINS=peertube -OPENDKIM_RequireSafeKeys=no - -PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC=public-read +POSTGRES_USER=@@user@@peertube@@u@@ +POSTGRES_PASSWORD=@@pass@@peertube@@p@@ +POSTGRES_DB=@@db@@peertube@@d@@ + +PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ +PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ +PEERTUBE_DB_SSL=false +PEERTUBE_DB_HOSTNAME=peertubeDB + +PEERTUBE_WEBSERVER_HOSTNAME=@@globalvar@@peertubeHost@@gv@@.@@globalvar@@domain@@gv@@ +PEERTUBE_TRUST_PROXY=['10.0.0.0/8', '127.0.0.1', 'loopback', '172.18.0.0/16'] + +PEERTUBE_SECRET=@@token@@peertube@@t@@ +PT_INITIAL_ROOT_PASSWORD=@@pass@@peertubeinitialroot@@p@@ + +#PEERTUBE_SMTP_USERNAME= +#PEERTUBE_SMTP_PASSWORD= +# Default to Postfix service name "postfix" in docker-compose.yml +# May be the hostname of your Custom SMTP server +PEERTUBE_SMTP_HOSTNAME=smtp.kaz.bzh +PEERTUBE_SMTP_PORT=25 +PEERTUBE_SMTP_FROM= +PEERTUBE_SMTP_TLS=false +PEERTUBE_SMTP_DISABLE_STARTTLS=false +PEERTUBE_ADMIN_EMAIL= + +POSTFIX_myhostname= +#OPENDKIM_DOMAINS=peertube +OPENDKIM_RequireSafeKeys=no + +PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC=public-read PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE=private \ No newline at end of file diff --git a/secret.tmpl/env-spipDB b/secret.tmpl/env-spipDB index 9c75bc5..019edbb 100644 --- a/secret.tmpl/env-spipDB +++ b/secret.tmpl/env-spipDB @@ -1,4 +1,4 @@ -MYSQL_ROOT_PASSWORD=@@pass@@spiproot@@p@@ -MYSQL_DATABASE=@@db@@spip@@d@@ -MYSQL_USER=@@user@@spip@@u@@ +MYSQL_ROOT_PASSWORD=@@pass@@spiproot@@p@@ +MYSQL_DATABASE=@@db@@spip@@d@@ +MYSQL_USER=@@user@@spip@@u@@ MYSQL_PASSWORD=@@pass@@spip@@p@@ \ No newline at end of file diff --git a/secret.tmpl/env-spipServ b/secret.tmpl/env-spipServ index 2df5105..399432b 100644 --- a/secret.tmpl/env-spipServ +++ b/secret.tmpl/env-spipServ @@ -1,10 +1,10 @@ -SPIP_AUTO_INSTALL=1 -SPIP_DB_SERVER=mysql -SPIP_DB_NAME=@@db@@spip@@d@@ -SPIP_DB_LOGIN=@@user@@spip@@u@@ -SPIP_DB_PASS=@@pass@@spip@@p@@ -SPIP_ADMIN_NAME=admin -SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ -SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ -SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ -PHP_TIMEZONE=Europe/Paris +SPIP_AUTO_INSTALL=1 +SPIP_DB_SERVER=mysql +SPIP_DB_NAME=@@db@@spip@@d@@ +SPIP_DB_LOGIN=@@user@@spip@@u@@ +SPIP_DB_PASS=@@pass@@spip@@p@@ +SPIP_ADMIN_NAME=admin +SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ +SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ +SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ +PHP_TIMEZONE=Europe/Paris diff --git a/secret.tmpl/env-traefik b/secret.tmpl/env-traefik index 552baf6..c2da618 100644 --- a/secret.tmpl/env-traefik +++ b/secret.tmpl/env-traefik @@ -1,2 +1,2 @@ -DASHBOARD_USER=@@user@@traefikdashboard@@u@@ +DASHBOARD_USER=@@user@@traefikdashboard@@u@@ DASHBOARD_PASSWORD=@@pass@@traefikdashboard@@p@@ \ No newline at end of file