KAZ/KazV2
11
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Pb fin de lignes windows ...

Browse Source
This commit is contained in:
Gael
2025-09-08 01:38:43 +02:00
parent 060c6e4443
commit e3041f2df6
17 changed files with 152 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/orgaTmpl/orga-gen.sh
View File

@@ -194,9 +194,12 @@ for ARG in "$@"; do
'-wp' | '-word'* ) '-wp' | '-word'* )
wp="off" wp="off"
;; ;;
'-pod' | '-casto'* ) '-pod' | '-casto'* )
castopod="off" castopod="off"
;; ;;
'-spip' )
spip="off"
;;
'+paheko' ) '+paheko' )
paheko="on" paheko="on"
;; ;;

4
config/orgaTmpl/secret.tmpl/env-castopodAdmin
View File

@@ -1,3 +1,3 @@
ADMIN_USER=@@pass@@castopod2@@p@@ ADMIN_USER=@@pass@@castopod2@@p@@
ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@
ADMIN_PASSWORD=@@pass@@castopod3@@p@@ ADMIN_PASSWORD=@@pass@@castopod3@@p@@

6
config/orgaTmpl/secret.tmpl/env-spipDB
View File

@@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=@@pass@@rootdb@@p@@ MYSQL_ROOT_PASSWORD=@@pass@@rootdb@@p@@
MYSQL_DATABASE=@@db@@spip@@d@@ MYSQL_DATABASE=@@db@@spip@@d@@
MYSQL_USER=@@user@@spip@@u@@ MYSQL_USER=@@user@@spip@@u@@
MYSQL_PASSWORD=@@pass@@spip@@p@@ MYSQL_PASSWORD=@@pass@@spip@@p@@

20
config/orgaTmpl/secret.tmpl/env-spipServ
View File

@@ -1,10 +1,10 @@
SPIP_AUTO_INSTALL=1 SPIP_AUTO_INSTALL=1
SPIP_DB_SERVER=mysql SPIP_DB_SERVER=mysql
SPIP_DB_NAME=@@db@@spip@@d@@ SPIP_DB_NAME=@@db@@spip@@d@@
SPIP_DB_LOGIN=@@user@@spip@@u@@ SPIP_DB_LOGIN=@@user@@spip@@u@@
SPIP_DB_PASS=@@pass@@spip@@p@@ SPIP_DB_PASS=@@pass@@spip@@p@@
SPIP_ADMIN_NAME=admin SPIP_ADMIN_NAME=admin
SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@
SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@
SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@
PHP_TIMEZONE=Europe/Paris PHP_TIMEZONE=Europe/Paris

84
dockers/spip/docker-compose.yml
View File

@@ -1,42 +1,42 @@
services: services:
db: db:
image: mariadb:11.4 image: mariadb:11.4
container_name: ${spipDBName} container_name: ${spipDBName}
restart: ${restartPolicy} restart: ${restartPolicy}
env_file: env_file:
- ../../secret/env-${spipDBName} - ../../secret/env-${spipDBName}
volumes: volumes:
- spipDB:/var/lib/mysql - spipDB:/var/lib/mysql
networks: networks:
- spipNet - spipNet
spip: spip:
image: ipeos/spip:4.4 image: ipeos/spip:4.4
restart: ${restartPolicy} restart: ${restartPolicy}
container_name: ${spipServName} container_name: ${spipServName}
env_file: env_file:
- ../../secret/env-${spipServName} - ../../secret/env-${spipServName}
links: links:
- db:mysql - db:mysql
environment: environment:
- SPIP_AUTO_INSTALL=1 - SPIP_AUTO_INSTALL=1
- SPIP_DB_HOST=${spipDBName} - SPIP_DB_HOST=${spipDBName}
- SPIP_SITE_ADDRESS=https://${spipHost}.${domain} - SPIP_SITE_ADDRESS=https://${spipHost}.${domain}
expose: expose:
- 80 - 80
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.${spipServName}.rule=Host(`${spipHost}.${domain}`)" - "traefik.http.routers.${spipServName}.rule=Host(`${spipHost}.${domain}`)"
networks: networks:
- spipNet - spipNet
volumes: volumes:
- spipData:/usr/src/spip - spipData:/usr/src/spip
volumes: volumes:
spipDB: spipDB:
spipData: spipData:
networks: networks:
spipNet: spipNet:
external: true external: true
name: spipNet name: spipNet

32
secret.tmpl/env-borg
View File

@@ -1,17 +1,17 @@
borg_VOLUME_SAUVEGARDES= borg_VOLUME_SAUVEGARDES=
borg_BORG_REPO= borg_BORG_REPO=
borg_BORG_PASSPHRASE=@@token@@borg@@t@@ borg_BORG_PASSPHRASE=@@token@@borg@@t@@
borg_BORGLOG="/var/log/borg" borg_BORGLOG="/var/log/borg"
borg_BORG_FIC_DEL="/tmp/sauvegarde_supp.txt" borg_BORG_FIC_DEL="/tmp/sauvegarde_supp.txt"
borg_BORG_EXCLUDE_BACKUP= borg_BORG_EXCLUDE_BACKUP=
borg_MAIL_RAPPORT=a@@@globalvar@@domain@@gv@@;b@@@globalvar@@domain@@gv@@;c@@@globalvar@@domain@@gv@@ borg_MAIL_RAPPORT=a@@@globalvar@@domain@@gv@@;b@@@globalvar@@domain@@gv@@;c@@@globalvar@@domain@@gv@@
borg_LISTREPSAUV= borg_LISTREPSAUV=
borg_BORGMOUNT="/mnt/repo_borg" borg_BORGMOUNT="/mnt/repo_borg"
borg_MAILOK= borg_MAILOK=
borg_MAILWARNING= borg_MAILWARNING=
borg_MAILDETAIL= borg_MAILDETAIL=
borg_BACKUPS_KEEP="4m" borg_BACKUPS_KEEP="4m"
borg_NB_BACKUPS_JOUR=90 borg_NB_BACKUPS_JOUR=90
borg_NB_BACKUPS_SEM=30 borg_NB_BACKUPS_SEM=30
borg_NB_BACKUPS_MOIS=12 borg_NB_BACKUPS_MOIS=12
borg_BORGSCRIPTS=/root/borgscripts borg_BORGSCRIPTS=/root/borgscripts

4
secret.tmpl/env-castopodAdmin
View File

@@ -1,3 +1,3 @@
ADMIN_USER=@@pass@@castopod2@@p@@ ADMIN_USER=@@pass@@castopod2@@p@@
ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@ ADMIN_MAIL=admin@@@globalvar@@domain@@gv@@
ADMIN_PASSWORD=@@pass@@castopod3@@p@@ ADMIN_PASSWORD=@@pass@@castopod3@@p@@

5
secret.tmpl/env-castopodDB
View File

@@ -1,4 +1,7 @@
MYSQL_ROOT_PASSWORD=@@pass@@castopod@@p@@ MYSQL_ROOT_PASSWORD=@@pass@@castopod@@p@@
MYSQL_USER=@@user@@castopod1@@u@@ MYSQL_USER=@@user@@castopod1@@u@@
MYSQL_PASSWORD=@@pass@@castopod1@@p@@ MYSQL_PASSWORD=@@pass@@castopod1@@p@@
MYSQL_DATABASE=@@db@@castopod1@@d@@ MYSQL_DATABASE=@@db@@castopod1@@d@@
CP_DATABASE_NAME=@@db@@castopod1@@d@@
CP_DATABASE_USERNAME=@@user@@castopod1@@u@@
CP_DATABASE_PASSWORD=@@pass@@castopod1@@p@@

20
secret.tmpl/env-kaz
View File

@@ -1,11 +1,11 @@
# tout est dans le env_kaz # tout est dans le env_kaz
# utilisé par gest containers # utilisé par gest containers
NAS_VOL= NAS_VOL=
OPERATE_ON_MAIN= # par defaut NON on ne traite que des orgas 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_ON_NAS_ORGA= # par defaut NON, on va aussi sur les orgas du NAS
OPERATE_LOCAL_ORGA="OUI" # par defaut oui 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_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 TEMPO_ACTION_START=60 # Lors de redémarrage avec tempo, avant de reload le proxy
DEFAULTCONTAINERS="cloud agora wp wiki office paheko castopod spip" 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 APPLIS_PAR_DEFAUT="tasks calendar contacts bookmarks mail richdocuments external drawio snappymail ransomware_protection" #rainloop richdocumentscode
QUIET="1" # redirection des echo QUIET="1" # redirection des echo

2
secret.tmpl/env-mail
View File

@@ -1,2 +1,2 @@
service_mail=admin@@@globalvar@@domain@@gv@@ service_mail=admin@@@globalvar@@domain@@gv@@
service_password=@@pass@@servicemail@@p@@ service_password=@@pass@@servicemail@@p@@

6
secret.tmpl/env-mattermostAdmin
View File

@@ -1,4 +1,4 @@
mattermost_user=@@user@@mattermost2@@u@@ mattermost_user=@@user@@mattermost2@@u@@
mattermost_pass=@@pass@@mattermost2@@p@@ mattermost_pass=@@pass@@mattermost2@@p@@
mattermost_token=@@token@@mattermost@@t@@ mattermost_token=@@token@@mattermost@@t@@

2
secret.tmpl/env-paheko
View File

@@ -1,2 +1,2 @@
API_USER=@@user@@pahekoapi@@u@@ API_USER=@@user@@pahekoapi@@u@@
API_PASSWORD=@@pass@@pahekoapi@@p@@ API_PASSWORD=@@pass@@pahekoapi@@p@@

14
secret.tmpl/env-peertubeDB
View File

@@ -1,8 +1,8 @@
POSTGRES_USER=@@user@@peertube@@u@@ POSTGRES_USER=@@user@@peertube@@u@@
POSTGRES_PASSWORD=@@pass@@peertube@@p@@ POSTGRES_PASSWORD=@@pass@@peertube@@p@@
POSTGRES_DB=@@db@@peertube@@d@@ POSTGRES_DB=@@db@@peertube@@d@@
PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@
PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@
PEERTUBE_DB_SSL=false PEERTUBE_DB_SSL=false
PEERTUBE_DB_HOSTNAME=peertubeDB PEERTUBE_DB_HOSTNAME=peertubeDB

62
secret.tmpl/env-peertubeServ
View File

@@ -1,32 +1,32 @@
POSTGRES_USER=@@user@@peertube@@u@@ POSTGRES_USER=@@user@@peertube@@u@@
POSTGRES_PASSWORD=@@pass@@peertube@@p@@ POSTGRES_PASSWORD=@@pass@@peertube@@p@@
POSTGRES_DB=@@db@@peertube@@d@@ POSTGRES_DB=@@db@@peertube@@d@@
PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@ PEERTUBE_DB_USERNAME=@@user@@peertube@@u@@
PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@ PEERTUBE_DB_PASSWORD=@@pass@@peertube@@p@@
PEERTUBE_DB_SSL=false PEERTUBE_DB_SSL=false
PEERTUBE_DB_HOSTNAME=peertubeDB PEERTUBE_DB_HOSTNAME=peertubeDB
PEERTUBE_WEBSERVER_HOSTNAME=@@globalvar@@peertubeHost@@gv@@.@@globalvar@@domain@@gv@@ 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_TRUST_PROXY=['10.0.0.0/8', '127.0.0.1', 'loopback', '172.18.0.0/16']
PEERTUBE_SECRET=@@token@@peertube@@t@@ PEERTUBE_SECRET=@@token@@peertube@@t@@
PT_INITIAL_ROOT_PASSWORD=@@pass@@peertubeinitialroot@@p@@ PT_INITIAL_ROOT_PASSWORD=@@pass@@peertubeinitialroot@@p@@
#PEERTUBE_SMTP_USERNAME= #PEERTUBE_SMTP_USERNAME=
#PEERTUBE_SMTP_PASSWORD= #PEERTUBE_SMTP_PASSWORD=
# Default to Postfix service name "postfix" in docker-compose.yml # Default to Postfix service name "postfix" in docker-compose.yml
# May be the hostname of your Custom SMTP server # May be the hostname of your Custom SMTP server
PEERTUBE_SMTP_HOSTNAME=smtp.kaz.bzh PEERTUBE_SMTP_HOSTNAME=smtp.kaz.bzh
PEERTUBE_SMTP_PORT=25 PEERTUBE_SMTP_PORT=25
PEERTUBE_SMTP_FROM= PEERTUBE_SMTP_FROM=
PEERTUBE_SMTP_TLS=false PEERTUBE_SMTP_TLS=false
PEERTUBE_SMTP_DISABLE_STARTTLS=false PEERTUBE_SMTP_DISABLE_STARTTLS=false
PEERTUBE_ADMIN_EMAIL= PEERTUBE_ADMIN_EMAIL=
POSTFIX_myhostname= POSTFIX_myhostname=
#OPENDKIM_DOMAINS=peertube #OPENDKIM_DOMAINS=peertube
OPENDKIM_RequireSafeKeys=no OPENDKIM_RequireSafeKeys=no
PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC=public-read PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC=public-read
PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE=private PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE=private

6
secret.tmpl/env-spipDB
View File

@@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=@@pass@@spiproot@@p@@ MYSQL_ROOT_PASSWORD=@@pass@@spiproot@@p@@
MYSQL_DATABASE=@@db@@spip@@d@@ MYSQL_DATABASE=@@db@@spip@@d@@
MYSQL_USER=@@user@@spip@@u@@ MYSQL_USER=@@user@@spip@@u@@
MYSQL_PASSWORD=@@pass@@spip@@p@@ MYSQL_PASSWORD=@@pass@@spip@@p@@

20
secret.tmpl/env-spipServ
View File

@@ -1,10 +1,10 @@
SPIP_AUTO_INSTALL=1 SPIP_AUTO_INSTALL=1
SPIP_DB_SERVER=mysql SPIP_DB_SERVER=mysql
SPIP_DB_NAME=@@db@@spip@@d@@ SPIP_DB_NAME=@@db@@spip@@d@@
SPIP_DB_LOGIN=@@user@@spip@@u@@ SPIP_DB_LOGIN=@@user@@spip@@u@@
SPIP_DB_PASS=@@pass@@spip@@p@@ SPIP_DB_PASS=@@pass@@spip@@p@@
SPIP_ADMIN_NAME=admin SPIP_ADMIN_NAME=admin
SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@ SPIP_ADMIN_LOGIN=@@user@@spipadmin@@u@@
SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@ SPIP_ADMIN_EMAIL=admin@@@globalvar@@domain@@gv@@
SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@ SPIP_ADMIN_PASS=@@pass@@spipadmin@@p@@
PHP_TIMEZONE=Europe/Paris PHP_TIMEZONE=Europe/Paris

2
secret.tmpl/env-traefik
View File

@@ -1,2 +1,2 @@
DASHBOARD_USER=@@user@@traefikdashboard@@u@@ DASHBOARD_USER=@@user@@traefikdashboard@@u@@
DASHBOARD_PASSWORD=@@pass@@traefikdashboard@@p@@ DASHBOARD_PASSWORD=@@pass@@traefikdashboard@@p@@