From 8b9bad576cbcb77a8d7b5347241513f6d773da3e Mon Sep 17 00:00:00 2001
From: Chris Vogel <github@z9.de>
Date: Fri, 19 Apr 2024 14:10:35 +0200
Subject: [PATCH] put 'bullseye' in manifest, generate flohmarkt couchdb
 password

---
 manifest.toml   | 10 +---------
 scripts/install |  3 +++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 0210157..eadd054 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -75,14 +75,6 @@ ram.runtime = "100M"
     ask.de = "Passwort für den admin Benutzer von CouchDB"
     help.de = "Bitte das Passwort notieren und aufheben! Dieses Passwort muss bei der Installation und bei zukünftigen Upgrades eingegeben werden. Wenn bereits eine CouchDB installiert ist, hier das Passwort der bestehenden Installation eingeben."
 
-    [install.password_couchdb_flohmarkt]
-    # cochdb flohmarkt user password
-    type = "password"
-    ask.en = "CouchDB password for flohmarkt user"
-    help.en = "This password will be used by flohmarkt during normal operation and is stored in its configuration file flohmarkt.conf"
-    ask.de = "Passwort für den admin Benutzer von CouchDB"
-    help.de = "Dieses Passwort wird von flohmarkt im normalen Betrieb verwendet und ist in der Konfigurationsdatei flohmarkt.conf gespeichert."
-
     [install.mail_user]
     # @@ any type for this to make sure it can be used as the user part of an email address?
     default = "flohmarkt"
@@ -166,7 +158,7 @@ ram.runtime = "100M"
     # python dependencies shall be installed in a venv using pip.
     packages = "python3-pip python3-full curl apt-transport-https gnupg"
     # repo for couchdb
-	extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main"
+	extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ bullseye main"
 	extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc"
 	extras.couchdb.packages = ["couchdb"]
 
diff --git a/scripts/install b/scripts/install
index 978ebb0..1b10fea 100755
--- a/scripts/install
+++ b/scripts/install
@@ -83,6 +83,9 @@ python3 -m venv --without-pip "$install_dir/venv"
 # JwtSecret
 jwtsecret=$(ynh_string_random --length=344 --filter='a-zA-Z0-9/+')
 
+password_couchdb_flohmarkt=$(ynh_string_random --length=31 --filter='A-Za-z0-9_+/;.,')
+ynh_app_setting_set --app=$app --key=erlang_cookie --value="$password_couchdb_flohmarkt"
+
 # generate flohmarkt.conf
 ynh_add_config --template="../conf/flohmarkt.conf" --destination="$install_dir/$app/flohmarkt.conf"