merge from upstream

40 files changed, 0 insertions, 16 deletions

diff --git a/app/config/secrets/.gitignore b/app/config/secrets/.gitignore
deleted file mode 100644
index 2ff3cd5..0000000
--- a/app/config/secrets/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Blacklist everything cleverly
-*
-!*/
-
-# Whitelist some patterns
-!*.sample
-!*.gen
-!*.sh
-!.gitignore
-
-# Whitelist specific files
diff --git a/app/config/secrets/chat/coturn/static-auth.sample b/app/config/secrets/chat/coturn/static-auth.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/coturn/static-auth.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/fb2mx/as_token.sample b/app/config/secrets/chat/fb2mx/as_token.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/fb2mx/as_token.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/fb2mx/db_url.sample b/app/config/secrets/chat/fb2mx/db_url.sample
deleted file mode 100644
index aff4635..0000000
--- a/app/config/secrets/chat/fb2mx/db_url.sample
+++ /dev/null
@@ -1 +0,0 @@
-postgres://username:password@hostname/dbname
diff --git a/app/config/secrets/chat/fb2mx/hs_token.sample b/app/config/secrets/chat/fb2mx/hs_token.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/fb2mx/hs_token.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.crt.sample b/app/config/secrets/chat/synapse/homeserver.tls.crt.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/homeserver.tls.crt.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.dh.sample b/app/config/secrets/chat/synapse/homeserver.tls.dh.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/homeserver.tls.dh.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/homeserver.tls.key.sample b/app/config/secrets/chat/synapse/homeserver.tls.key.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/homeserver.tls.key.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/ldap_binddn.sample b/app/config/secrets/chat/synapse/ldap_binddn.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/ldap_binddn.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/ldap_bindpw.sample b/app/config/secrets/chat/synapse/ldap_bindpw.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/ldap_bindpw.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/postgres_db.sample b/app/config/secrets/chat/synapse/postgres_db.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/postgres_db.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/postgres_pwd.sample b/app/config/secrets/chat/synapse/postgres_pwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/postgres_pwd.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/postgres_user.sample b/app/config/secrets/chat/synapse/postgres_user.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/postgres_user.sample
+++ /dev/null
diff --git a/app/config/secrets/chat/synapse/registration_shared_secret.sample b/app/config/secrets/chat/synapse/registration_shared_secret.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/chat/synapse/registration_shared_secret.sample
+++ /dev/null
diff --git a/app/config/secrets/email/dkim/smtp.private.sample b/app/config/secrets/email/dkim/smtp.private.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/dkim/smtp.private.sample
+++ /dev/null
diff --git a/app/config/secrets/email/dovecot/dovecot.crt.sample b/app/config/secrets/email/dovecot/dovecot.crt.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/dovecot/dovecot.crt.sample
+++ /dev/null
diff --git a/app/config/secrets/email/dovecot/dovecot.key.sample b/app/config/secrets/email/dovecot/dovecot.key.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/dovecot/dovecot.key.sample
+++ /dev/null
diff --git a/app/config/secrets/email/dovecot/ldap_binddn.sample b/app/config/secrets/email/dovecot/ldap_binddn.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/dovecot/ldap_binddn.sample
+++ /dev/null
diff --git a/app/config/secrets/email/dovecot/ldap_bindpwd.sample b/app/config/secrets/email/dovecot/ldap_bindpwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/dovecot/ldap_bindpwd.sample
+++ /dev/null
diff --git a/app/config/secrets/email/postfix/postfix.crt.sample b/app/config/secrets/email/postfix/postfix.crt.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/postfix/postfix.crt.sample
+++ /dev/null
diff --git a/app/config/secrets/email/postfix/postfix.key.sample b/app/config/secrets/email/postfix/postfix.key.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/postfix/postfix.key.sample
+++ /dev/null
diff --git a/app/config/secrets/email/sogo/ldap_binddn.sample b/app/config/secrets/email/sogo/ldap_binddn.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/sogo/ldap_binddn.sample
+++ /dev/null
diff --git a/app/config/secrets/email/sogo/ldap_bindpw.sample b/app/config/secrets/email/sogo/ldap_bindpw.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/sogo/ldap_bindpw.sample
+++ /dev/null
diff --git a/app/config/secrets/email/sogo/postgre_auth.sample b/app/config/secrets/email/sogo/postgre_auth.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/email/sogo/postgre_auth.sample
+++ /dev/null
diff --git a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
+++ /dev/null
diff --git a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
+++ /dev/null
diff --git a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
+++ /dev/null
diff --git a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
+++ /dev/null
diff --git a/app/config/secrets/mariadb/main/ldap_binddn.sample b/app/config/secrets/mariadb/main/ldap_binddn.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/mariadb/main/ldap_binddn.sample
+++ /dev/null
diff --git a/app/config/secrets/mariadb/main/ldap_bindpwd.sample b/app/config/secrets/mariadb/main/ldap_bindpwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/mariadb/main/ldap_bindpwd.sample
+++ /dev/null
diff --git a/app/config/secrets/mariadb/main/mysql_pwd.sample b/app/config/secrets/mariadb/main/mysql_pwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/mariadb/main/mysql_pwd.sample
+++ /dev/null
diff --git a/app/config/secrets/platoo/bddpw.sample b/app/config/secrets/platoo/bddpw.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/platoo/bddpw.sample
+++ /dev/null
diff --git a/app/config/secrets/plume/pgsql_pw.sh b/app/config/secrets/plume/pgsql_pw.sh
deleted file mode 100755
index 519a30a..0000000
--- a/app/config/secrets/plume/pgsql_pw.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-openssl rand -base64 32 > pgsql_pw
diff --git a/app/config/secrets/plume/secret_key.sh b/app/config/secrets/plume/secret_key.sh
deleted file mode 100755
index f4bbee5..0000000
--- a/app/config/secrets/plume/secret_key.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-openssl rand -base64 32 > secret_key
diff --git a/app/config/secrets/postgres/keeper/pg_repl_pwd.sample b/app/config/secrets/postgres/keeper/pg_repl_pwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/postgres/keeper/pg_repl_pwd.sample
+++ /dev/null
diff --git a/app/config/secrets/postgres/keeper/pg_repl_username.sample b/app/config/secrets/postgres/keeper/pg_repl_username.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/postgres/keeper/pg_repl_username.sample
+++ /dev/null
diff --git a/app/config/secrets/postgres/keeper/pg_su_pwd.sample b/app/config/secrets/postgres/keeper/pg_su_pwd.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/postgres/keeper/pg_su_pwd.sample
+++ /dev/null
diff --git a/app/config/secrets/seafile/conf/mykey.peer.sample b/app/config/secrets/seafile/conf/mykey.peer.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/seafile/conf/mykey.peer.sample
+++ /dev/null
diff --git a/app/config/secrets/web/home_token.sample b/app/config/secrets/web/home_token.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/web/home_token.sample
+++ /dev/null
diff --git a/app/config/secrets/web/quentin.dufour.io_token.sample b/app/config/secrets/web/quentin.dufour.io_token.sample
deleted file mode 100644
index e69de29..0000000
--- a/app/config/secrets/web/quentin.dufour.io_token.sample
+++ /dev/null