gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated: rename sandbox -> bank


From: gnunet
Subject: [libeufin] branch master updated: rename sandbox -> bank
Date: Thu, 07 Sep 2023 15:21:01 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new d2206434 rename sandbox -> bank
d2206434 is described below

commit d2206434da014de23d8d96109882d059a60a0cdc
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Thu Sep 7 15:20:50 2023 +0200

    rename sandbox -> bank
---
 Makefile                                           | 14 ++++++------
 build.gradle                                       |  2 +-
 debian/changelog                                   |  6 +++++
 debian/control                                     | 12 +++++-----
 .../{libeufin-sandbox => libeufin-bank}            |  4 ++--
 ...eufin-sandbox.install => libeufin-bank.install} |  0
 debian/libeufin-bank.libeufin-bank.service         | 14 ++++++++++++
 ...fin-sandbox.postinst => libeufin-bank.postinst} |  0
 ...ibeufin-sandbox.postrm => libeufin-bank.postrm} |  0
 ...{libeufin-sandbox.prerm => libeufin-bank.prerm} |  0
 debian/libeufin-nexus.install                      |  3 +--
 debian/libeufin-sandbox.libeufin-sandbox.service   | 14 ------------
 debian/rules                                       | 26 +++++++++++-----------
 13 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/Makefile b/Makefile
index 6ecb01f0..3e700512 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include build-system/config.mk
 escaped_pwd = $(shell pwd | sed 's/\//\\\//g')
 
 all: assemble
-install: install-nexus install-sandbox install-cli install-db-versioning
+install: install-nexus install-bank install-cli install-db-versioning
 git-archive-all = 
./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py
 git_tag=$(shell git describe --tags)
 gradle_version=$(shell ./gradlew -q libeufinVersion)
@@ -35,9 +35,9 @@ get-spa:
 deb: exec-arch copy-spa
        @dpkg-buildpackage -rfakeroot -b -uc -us
 
-.PHONY: install-sandbox
-install-sandbox:
-       @./gradlew -q -Pprefix=$(prefix) sandbox:installToPrefix; cd ..
+.PHONY: install-bank
+install-bank:
+       @./gradlew -q -Pprefix=$(prefix) bank:installToPrefix; cd ..
 
 .PHONY: install-nexus
 install-nexus:
@@ -54,12 +54,12 @@ install-db-versioning:
        @sed "s|__STATIC_PATCHES_LOCATION__|$(prefix)/share/libeufin/sql|" < 
contrib/$(LOAD_SQL_SCRIPT_NAME) > build/$(LOAD_SQL_SCRIPT_NAME)
        @install -D database-versioning/*.sql -t $(prefix)/share/libeufin/sql
        @install -D build/$(LOAD_SQL_SCRIPT_NAME) -t $(prefix)/bin
-       $(eval SANDBOX_DBINIT_SCRIPT := libeufin-bank-dbinit)
-       @sed 
"s|__SANDBOX_STATIC_PATCHES_LOCATION__|$(prefix)/share/libeufin/sql/bank|" < 
contrib/$(SANDBOX_DBINIT_SCRIPT) > build/$(SANDBOX_DBINIT_SCRIPT)
+       $(eval BANK_DBINIT_SCRIPT := libeufin-bank-dbinit)
+       @sed 
"s|__BANK_STATIC_PATCHES_LOCATION__|$(prefix)/share/libeufin/sql/bank|" < 
contrib/$(BANK_DBINIT_SCRIPT) > build/$(BANK_DBINIT_SCRIPT)
        @install -D database-versioning/new/libeufin-bank*.sql -t 
$(prefix)/share/libeufin/sql/bank
        @install -D database-versioning/new/versioning.sql -t 
$(prefix)/share/libeufin/sql/bank
        @install -D database-versioning/new/procedures.sql -t 
$(prefix)/share/libeufin/sql/bank
-       @install -D build/$(SANDBOX_DBINIT_SCRIPT) -t $(prefix)/bin
+       @install -D build/$(BANK_DBINIT_SCRIPT) -t $(prefix)/bin
 
 .PHONY: assemble
 assemble:
diff --git a/build.gradle b/build.gradle
index 6f944e01..b3ec87d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = 'tech.libeufin'
-version = '0.9.2'
+version = '0.9.3'
 
 if (!JavaVersion.current().isJava11Compatible()){
     throw new GradleException(
diff --git a/debian/changelog b/debian/changelog
index a676d96a..340263c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libeufin (0.9.3) unstable; urgency=medium
+
+  * Starting to package for v0.9.3.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Sat, 4 Mar 2023 14:47:04 +0200
+
 libeufin (0.9.2-2) unstable; urgency=medium
 
   * Try to fix DB setup rules.
diff --git a/debian/control b/debian/control
index 9435eb51..d4d4fc50 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Depends: openjdk-11-jdk-headless | openjdk-11-jdk | 
openjdk-12-jdk-headless | op
          python3-requests,
          ${misc:Depends}
 Recommends:
-Description: Resources shared between libeufin-nexus and libeufin-sandbox.
+Description: Resources shared between libeufin-nexus and libeufin-bank.
 
 Package: libeufin-nexus
 Architecture: all
@@ -28,22 +28,22 @@ Depends: openjdk-11-jdk-headless | openjdk-11-jdk | 
openjdk-12-jdk-headless | op
          python3-click,
          python3-requests,
          libeufin-common,
-         apache2 | nginx | httpd,
          ${misc:Depends}
-Recommends:
+Recommends: apache2 | nginx | httpd,
+        postgresql (>= 13.0)
 Description: Software package to access FinTS/EBICS based
  core banking systems.
 
 
-Package: libeufin-sandbox
+Package: libeufin-bank
 Architecture: all
 Depends: openjdk-11-jdk-headless | openjdk-11-jdk | openjdk-12-jdk-headless | 
openjdk-12-jdk | openjdk-13-jdk-headless | openjdk-13-jdk | 
openjdk-14-jdk-headless | openjdk-14-jdk | openjdk-15-jdk-headless | 
openjdk-15-jdk | openjdk-16-jdk-headless | openjdk-16-jdk | 
openjdk-17-jdk-headless | openjdk-17-jdk | openjdk-18-jdk-headless | 
openjdk-18-jdk | openjdk-19-jdk-headless | openjdk-19-jdk | 
openjdk-20-jdk-headless | openjdk-20-jdk | openjdk-21-jdk-headless | 
openjdk-21-jdk,
          python3 (>= 3.7),
          python3-click,
          python3-requests,
          libeufin-common,
-         apache2 | nginx | httpd,
          ${misc:Depends}
-Recommends:
+Recommends: apache2 | nginx | httpd,
+        postgresql (>= 13.0)
 Description: Software package to provide a reference
  implementation of a FinTS/EBICS based core banking system.
diff --git a/debian/etc/nginx/sites-available/libeufin-sandbox 
b/debian/etc/nginx/sites-available/libeufin-bank
similarity index 91%
rename from debian/etc/nginx/sites-available/libeufin-sandbox
rename to debian/etc/nginx/sites-available/libeufin-bank
index 71203a92..9758165f 100644
--- a/debian/etc/nginx/sites-available/libeufin-sandbox
+++ b/debian/etc/nginx/sites-available/libeufin-bank
@@ -14,8 +14,8 @@ server {
   # - replace with your actual server name.
   server_name localhost;
 
-  access_log /var/log/nginx/libeufin-sandbox.log;
-  error_log /var/log/nginx/libeufin-sandbox.err;
+  access_log /var/log/nginx/libeufin-bank.log;
+  error_log /var/log/nginx/libeufin-bank.err;
 
   # Doesn't take requests away from the backend,
   # because that expects always a "/demobanks/default"
diff --git a/debian/libeufin-sandbox.install b/debian/libeufin-bank.install
similarity index 100%
rename from debian/libeufin-sandbox.install
rename to debian/libeufin-bank.install
diff --git a/debian/libeufin-bank.libeufin-bank.service 
b/debian/libeufin-bank.libeufin-bank.service
new file mode 100644
index 00000000..28598ab4
--- /dev/null
+++ b/debian/libeufin-bank.libeufin-bank.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=LibEuFin Bank service.
+
+[Service]
+EnvironmentFile=/etc/libeufin/bank.env
+User=libeufin-bank
+ExecStart=/usr/bin/libeufin-bank serve --port=${LIBEUFIN_BANK_PORT}
+Restart=on-failure
+RestartSec=1s
+RuntimeMaxSec=3600s
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/libeufin-sandbox.postinst b/debian/libeufin-bank.postinst
similarity index 100%
rename from debian/libeufin-sandbox.postinst
rename to debian/libeufin-bank.postinst
diff --git a/debian/libeufin-sandbox.postrm b/debian/libeufin-bank.postrm
similarity index 100%
rename from debian/libeufin-sandbox.postrm
rename to debian/libeufin-bank.postrm
diff --git a/debian/libeufin-sandbox.prerm b/debian/libeufin-bank.prerm
similarity index 100%
rename from debian/libeufin-sandbox.prerm
rename to debian/libeufin-bank.prerm
diff --git a/debian/libeufin-nexus.install b/debian/libeufin-nexus.install
index 0a5e6566..8b137891 100644
--- a/debian/libeufin-nexus.install
+++ b/debian/libeufin-nexus.install
@@ -1,2 +1 @@
-# Files needed by dbconf
-debian/db/install-nexus/* 
usr/share/dbconfig-common/scripts/libeufin-nexus/install/
+
diff --git a/debian/libeufin-sandbox.libeufin-sandbox.service 
b/debian/libeufin-sandbox.libeufin-sandbox.service
deleted file mode 100644
index 5d7da439..00000000
--- a/debian/libeufin-sandbox.libeufin-sandbox.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=LibEuFin Sandbox service.
-
-[Service]
-EnvironmentFile=/etc/libeufin/sandbox.env
-User=libeufin-sandbox
-ExecStart=/usr/bin/libeufin-sandbox serve --port=${LIBEUFIN_SANDBOX_PORT}
-Restart=on-failure
-RestartSec=1s
-RuntimeMaxSec=3600s
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index 2d7472d5..7e81b0be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,13 +26,13 @@ override_dh_auto_configure:
 override_dh_auto_install:
        unzip build/distributions/libeufin-$(FULLVER).zip
        dh_install libeufin-$(FULLVER)/lib/nexus-$(FULLVER)-all.jar 
$(LIBEUFIN_HOME)/lib
-       dh_install libeufin-$(FULLVER)/lib/sandbox-$(FULLVER)-all.jar 
$(LIBEUFIN_HOME)/lib
+       dh_install libeufin-$(FULLVER)/lib/bank-$(FULLVER)-all.jar 
$(LIBEUFIN_HOME)/lib
        install -D -m755 libeufin-$(FULLVER)/bin/libeufin-cli 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-cli
        install -D -m755 libeufin-$(FULLVER)/bin/libeufin-nexus 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-nexus
-       install -D -m755 libeufin-$(FULLVER)/bin/libeufin-sandbox 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-sandbox
+       install -D -m755 libeufin-$(FULLVER)/bin/libeufin-bank 
debian/libeufin/$(LIBEUFIN_HOME)/bin/libeufin-bank
        dh_link $(LIBEUFIN_HOME)/bin/libeufin-cli /usr/bin/libeufin-cli
        dh_link $(LIBEUFIN_HOME)/bin/libeufin-nexus /usr/bin/libeufin-nexus
-       dh_link $(LIBEUFIN_HOME)/bin/libeufin-sandbox /usr/bin/libeufin-sandbox
+       dh_link $(LIBEUFIN_HOME)/bin/libeufin-bank /usr/bin/libeufin-bank
 
 # Override this step because it's very slow and likely
 # unnecessary for us.
@@ -54,15 +54,15 @@ override_dh_install:
        mv debian/libeufin/usr/share/libeufin/bin/libeufin-nexus \
            debian/libeufin-nexus/usr/share/libeufin/bin/
 
-       mkdir -p debian/libeufin-sandbox/usr/share/libeufin/lib/
-       mv debian/libeufin-common/usr/share/libeufin/lib/sandbox-*.jar \
-           debian/libeufin-sandbox/usr/share/libeufin/lib/
-       mkdir -p debian/libeufin-sandbox/usr/bin/
-       mv debian/libeufin-common/usr/bin/libeufin-sandbox \
-           debian/libeufin-sandbox/usr/bin/
-       mkdir -p debian/libeufin-sandbox/usr/share/libeufin/bin/
-       mv debian/libeufin/usr/share/libeufin/bin/libeufin-sandbox \
-           debian/libeufin-sandbox/usr/share/libeufin/bin/
+       mkdir -p debian/libeufin-bank/usr/share/libeufin/lib/
+       mv debian/libeufin-common/usr/share/libeufin/lib/bank-*.jar \
+           debian/libeufin-bank/usr/share/libeufin/lib/
+       mkdir -p debian/libeufin-bank/usr/bin/
+       mv debian/libeufin-common/usr/bin/libeufin-bank \
+           debian/libeufin-bank/usr/bin/
+       mkdir -p debian/libeufin-bank/usr/share/libeufin/bin/
+       mv debian/libeufin/usr/share/libeufin/bin/libeufin-bank \
+           debian/libeufin-bank/usr/share/libeufin/bin/
 
        mkdir -p debian/libeufin-common/usr/share/libeufin/bin/
        mv debian/libeufin/usr/share/libeufin/bin/libeufin-cli \
@@ -74,7 +74,7 @@ override_dh_installsystemd:
        # Need to specify units manually, since we have multiple
        # and dh_installsystemd by default only looks for "<package>.service".
        dh_installsystemd -plibeufin-nexus --name=libeufin-nexus --no-start 
--no-enable
-       dh_installsystemd -plibeufin-sandbox --name=libeufin-sandbox --no-start 
--no-enable
+       dh_installsystemd -plibeufin-bank --name=libeufin-bank --no-start 
--no-enable
        # final invocation to generate daemon reload
        dh_installsystemd
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]