Remove INI instances configuration.

1 files changed, 1 insertions, 40 deletions

diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index 33ac4a6..16f816b 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -96,24 +96,10 @@ def config(obj):
     obj.cfg_put("bank", "database", "postgres:///taler{}".format(obj.envname))
     obj.cfg_put("bank", "suggested_exchange", "https://exchange.{}.taler.net/".format(obj.envname))
 
-
     obj.cfg_put("bank-admin", "uwsgi_serve", "unix")
     obj.cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi")
     obj.cfg_put("bank-admin", "uwsgi_unixpath_mode", "660")
 
-    obj.cfg_put("donations", "uwsgi_serve", "unix")
-    obj.cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi")
-    obj.cfg_put("donations", "uwsgi_unixpath_mode", "660")
-
-    obj.cfg_put("survey", "uwsgi_serve", "unix")
-    obj.cfg_put("survey", "uwsgi_unixpath", "$HOME/sockets/survey.uwsgi")
-    obj.cfg_put("survey", "uwsgi_unixpath_mode", "660")
-
-    obj.cfg_put("blog", "uwsgi_serve", "unix")
-    obj.cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/shop.uwsgi")
-    obj.cfg_put("blog", "uwsgi_unixpath_mode", "660")
-    obj.cfg_put("blog", "instance", "FSF")
-
     obj.cfg_put("backoffice-all", "backend", "https://backend.{}.taler.net/".format(obj.envname))
 
     # Keep only one back-office service for all instances, for simplicity.
@@ -210,31 +196,6 @@ def config(obj):
 
     obj.cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day")
 
-    # instance FSF
-    obj.cfg_put("instance-FSF", "keyfile", "${TALER_DATA_HOME}/merchant/fsf.priv")
-    obj.cfg_put("instance-FSF", "name", "Free Software Foundation")
-    obj.cfg_put("merchant-location-FSF-address", "street", "51 Franklin Street, Fifth Floor.")
-    obj.cfg_put("merchant-location-FSF-address", "city", "Boston")
-    obj.cfg_put("merchant-location-FSF-address", "country", "USA")
-    # instance Tor
-    obj.cfg_put("instance-Tor", "keyfile", "${TALER_DATA_HOME}/merchant/tor.priv")
-    obj.cfg_put("instance-Tor", "name", "The Tor Project")
-    # instance GNUnet
-    obj.cfg_put("instance-GNUnet", "keyfile", "${TALER_DATA_HOME}/merchant/gnunet.priv")
-    obj.cfg_put("instance-GNUnet", "name", "GNUnet Project")
-    # instance Taler
-    obj.cfg_put("instance-Taler", "keyfile", "${TALER_DATA_HOME}/merchant/taler.priv")
-    obj.cfg_put("instance-Taler", "name", "Taler")
-    # instance default
-    obj.cfg_put("instance-default", "keyfile", "${TALER_DATA_HOME}/merchant/default.priv")
-    obj.cfg_put("instance-default", "name", "Kudos Inc.")
-    obj.cfg_put("merchant-location-default-address", "country", "Kudosland")
-    obj.cfg_put("instance-default", "tip_reserve_priv_filename", "${TALER_DATA_HOME}/merchant/default-tip.priv")
-    obj.cfg_put("instance-default", "tip_exchange", "https://exchange.{}.taler.net/".format(obj.envname))
-    # instance tutorial
-    obj.cfg_put("instance-Tutorial", "keyfile", "${TALER_DATA_HOME}/merchant/tutorial.priv")
-    obj.cfg_put("instance-Tutorial", "name", "Tutorial")
-
     if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("merchant-account-merchant", "payto_uri", "payto://x-taler-bank/twister-bank.taler.net/Tutorial")
     else:
@@ -243,6 +204,7 @@ def config(obj):
     obj.cfg_put("merchant-account-merchant", "wire_response", "${TALER_DATA_HOME}/merchant/wire/merchant.json")
     obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770")
 
+    # The following block should be obsoleted by the new API to configure instances.
     merchant_instance_names = ("default", "Tor", "GNUnet", "Taler", "FSF", "Tutorial")
     for mi in merchant_instance_names:
         obj.cfg_put("merchant-account-merchant", f"HONOR_{mi}", "YES")
@@ -255,7 +217,6 @@ def config(obj):
     coin(obj, "10", "10")
     coin(obj, "1000", "1000")
 
-
 @click.command()
 @click.option("--currency", default="KUDOS")
 @click.option("--envname", default="demo")