Simplified configs variable addition using format __FOO__.

conf/couch.ini

@@ -6,4 +6,4 @@ enable_cors = true
 credentials = true
 headers	= accept, authorization, content-type, origin, referer
 methods	= GET, PUT, POST, HEAD, DELETE
-origins = https://{{{domain}}}
+origins = https://__DOMAIN__

conf/private-autosync.js

@@ -6,18 +6,18 @@ module.exports = {
   debug: false,
   refreshServiceWorkerScriptAtEachRequest: false,
 
-  port: "{{{port}}}",
+  port: "__PORT__",
 
   authentication: {
-    couchUrl: "{{{couch_url}}}",
+    couchUrl: "__COUCH_URL__",
   },
   couchAdminAuthentication: {
     // couch admin user:
-    username: "{{{couch_admin_name}}}",
+    username: "__COUCH_ADMIN_NAME__",
     // couch admin user's password:
-    password: "{{{couch_admin_password}}}",
+    password: "__COUCH_ADMIN_PASSWORD__",
     // the url where your couchdb server is accessible from the internet:
-    customCouchUrl: "{{{couch_url}}}",
+    customCouchUrl: "__COUCH_URL__",
   },
 
 };

conf/private.js

@@ -6,6 +6,6 @@ module.exports = {
   debug: false,
   refreshServiceWorkerScriptAtEachRequest: false,
 
-  port: "{{{port}}}",
+  port: "__PORT__",
 
 };

conf/public.js

@@ -1,7 +1,7 @@
 
 module.exports = {
 
-  adminEmail: "{{{admin_email}}}",
+  adminEmail: "__ADMIN_EMAIL__",
 
   otherOptionsThanLogin: [
     "If you have no dato account, you should request one to the administrator of this server.",

manifest.json

@@ -121,12 +121,12 @@
         "name": "admin_email",
         "type": "string",
         "ask": {
-          "en": "If you want the dato administrator email to be displayed in login page, so that users can contact you to create accounts... you can set your email here. Otherwise leave this to 'none'. (only if autosynchronization is enabled)",
-          "fr": "Si tu souhaites que l'email de l'administrateur de dato soit visible sur la page de login, afin que les utilisateurs puissent le contacter pour des demandes de compte... tu peux le spécifier ici. Sinon, choisis 'none'. (nécessaire uniquement si l'autosynchronisation a été activée)"
+          "en": "If you want the dato administrator email to be displayed in login page, so that users can contact you to create accounts... you can set your email here. Otherwise leave this empty. (only useful if autosynchronization is enabled)",
+          "fr": "Si tu souhaites que l'email de l'administrateur de dato soit visible sur la page de login, afin que les utilisateurs puissent le contacter pour des demandes de compte... tu peux le spécifier ici. Sinon, laisser ce champ vide. (utile uniquement si l'autosynchronisation a été activée)"
         },
         "example": "datoadmin((at))domain.tld",
         "optional": true,
-        "default" : "none"
+        "default" : ""
       }
     ]
   }

scripts/_common.sh

@@ -25,22 +25,9 @@ dato_setup_config_files() {
   # setup private dato config
   if [[ $autosynchronize == true ]]; then
   	ynh_add_config --template="../conf/private-autosync.js" --destination="$final_path/config/private.js"
-  	# setup couch url, admin name and password
-  	ynh_replace_string --match_string="{{{couch_url}}}" --replace_string="$couch_url" --target_file="$final_path/config/private.js"
-  	ynh_replace_string --match_string="{{{couch_admin_name}}}" --replace_string="$couch_admin_name" --target_file="$final_path/config/private.js"
-  	ynh_replace_string --match_string="{{{couch_admin_password}}}" --replace_string="$couch_admin_password" --target_file="$final_path/config/private.js"
   else
   	ynh_add_config --template="../conf/private.js" --destination="$final_path/config/private.js"
   fi
-  # setup port to use
-  ynh_replace_string --match_string="{{{port}}}" --replace_string="$port" --target_file="$final_path/config/private.js"
-
-  # add admin email to public config if it was set
-  if [[ $admin_email != "none" ]]; then
-  	ynh_replace_string --match_string="{{{admin_email}}}" --replace_string="$admin_email" --target_file="$final_path/config/public.js"
-  else
-  	ynh_replace_string --match_string="{{{admin_email}}}" --replace_string="" --target_file="$final_path/config/public.js"
-  fi
 
 }
 

scripts/install

@@ -181,7 +181,6 @@ if [[ $autosynchronize == true ]]; then
 
 	# make sure that couchdb has CORS enabled and that it accepts requests from dato domain
 	ynh_add_config --template="../conf/couch.ini" --destination="/opt/couchdb/etc/local.d/$app.ini"
-	ynh_replace_string --match_string="{{{domain}}}" --replace_string="$domain" --target_file="/opt/couchdb/etc/local.d/$app.ini"
 
 	ynh_store_file_checksum --file="/opt/couchdb/etc/local.d/$app.ini"