Explorar o código

flohmarkt config, email

Chris Vogel hai 1 ano
pai
achega
1f614a3733
Modificáronse 3 ficheiros con 32 adicións e 3 borrados
  1. 18 0
      conf/flohmarkt.conf
  2. 11 1
      manifest.toml
  3. 3 2
      scripts/install

+ 18 - 0
conf/flohmarkt.conf

@@ -0,0 +1,18 @@
+[General]
+InstanceName = __FLOHMARKT_NAME__
+ExternalURL = https://__DOMAIN__/__PATH__
+DebugMode = 0
+JwtSecret = __JWTSECRET__
+DataPath = __DATA_DIR__
+
+[Database]
+Server = https://__APP__:__PASSWORD_COUCHDB_ADMIN__@127.0.0.1:__PORT_COUCHDB__/
+
+[SMTP]
+Server = 127.0.0.1
+Port = 587
+# die From Adresse sollte in app_senders_login_maps landen...
+From = __APP__@__DOMAIN__
+User = __APP__
+Password = __MAIL_PWD__
+CAFile = /etc/ssl/certs/ca-certificates.crt

+ 11 - 1
manifest.toml

@@ -68,6 +68,10 @@ ram.runtime = "50M"
     # couchdb admin password
     type = "password"
 
+    [install.password_couchdb_flohmarkt]
+    # cochdb flohmarkt user password
+    type = "password"
+
 [resources]
     # See the packaging documentation for the full set
     # of explanation regarding the behavior and properties for each of those
@@ -88,8 +92,14 @@ ram.runtime = "50M"
 
     # autoupdate.strategy = "latest_github_tag"
 
-    [resources.system_user]
     # This will provision/deprovision a unix system user named id form above → 'flohmarkt'
+    [resources.system_user]
+    allow_email = true
+    mail_user = "replace_mail_user_in_manifest_toml"
+    mail_domain = "replace_mail_domain_in_manifest.toml"
+    # @@ how to create a couchdb user if needed? in install-script manually?
+    # @@ where to get/put mail_user and mail_domain to let the user set the address?
+    #    https://yunohost.org/de/packaging_apps_resources#properties-4
 
     [resources.install_dir]
     dir = "/opt/flohmarkt"

+ 3 - 2
scripts/install

@@ -45,7 +45,7 @@ chmod -R o-rwx "$install_dir"
 chown -R "$app:$app" "$install_dir"
 
 # get flohmarkt
-ynh_setup_source --dest_dir="$install_dir/flohmarkt.git/"
+ynh_setup_source --dest_dir="$install_dir/$app/"
 
 # setup python environment for flohmarkt
 ynh_secure_remove "$install_dir/venv"
@@ -58,10 +58,11 @@ python3 -m venv --without-pip "$install_dir/venv"
     set -o nounset
     set -x
     $install_dir/venv/bin/python3 -m ensurepip
-    $install_dir/venv/bin/pip3 install -r "$install_dir/flohmarkt.git/requirements.txt"
+    $install_dir/venv/bin/pip3 install -r "$install_dir/$app/requirements.txt"
 )
 
 # @@ configure
+ynh_add_config --template="../conf/flohmarkt.ini" --destination="$install_dir/$app/flohmarkt.ini"
 
 # SETUP LOGROTATE
 ynh_script_progression --message="Configuring log rotation..." --weight=2