-
Notifications
You must be signed in to change notification settings - Fork 185
Add Joinmarket GUI #606
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Add Joinmarket GUI #606
Changes from 1 commit
ddb2650
142256e
bc72694
6c0360a
30b86dc
46cc7e2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # JoinMarket GUI service | ||
| # /etc/systemd/system/jmg.service | ||
|
|
||
| [Unit] | ||
| Description=JMG | ||
| Wants=bitcoin.service | ||
| After=bitcoin.service | ||
|
|
||
| [Service] | ||
| ExecStartPre=/usr/bin/is_not_shutting_down.sh | ||
| ExecStartPre=/usr/bin/is_mainnet.sh | ||
| WorkingDirectory=/home/joinmarket/jmg | ||
| ExecStart=/bin/sh -c 'cd /home/joinmarket/jmg && ./jmg_venv/bin/python src/app.py' | ||
|
|
||
| User=joinmarket | ||
| Group=joinmarket | ||
| Type=simple | ||
| TimeoutSec=120 | ||
| Restart=always | ||
| RestartSec=30 | ||
| StandardOutput=syslog | ||
| StandardError=syslog | ||
| SyslogIdentifier=jmg | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # JoinMarket Wallet service | ||
| # /etc/systemd/system/jmwalletd.service | ||
|
|
||
| [Unit] | ||
| Description=JoinMarketWallet | ||
| Wants=bitcoin.service | ||
| After=bitcoin.service | ||
|
|
||
| [Service] | ||
| ExecStartPre=/usr/bin/is_not_shutting_down.sh | ||
| ExecStartPre=/usr/bin/is_mainnet.sh | ||
| WorkingDirectory=/home/joinmarket/joinmarket-clientserver | ||
| ExecStart=/bin/sh -c 'cd /home/joinmarket/joinmarket-clientserver && ./jmvenv/bin/python scripts/jmwalletd.py' | ||
|
|
||
| User=joinmarket | ||
| Group=joinmarket | ||
| Type=simple | ||
| TimeoutSec=120 | ||
| Restart=always | ||
| RestartSec=30 | ||
| StandardOutput=syslog | ||
| StandardError=syslog | ||
| SyslogIdentifier=jmwalletd | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -634,6 +634,40 @@ if should_install_app "joininbox" ; then | |
| fi | ||
| fi | ||
|
|
||
| # Install JoinMarket GUI | ||
| if should_install_app "jm"; then | ||
| if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then | ||
| JMG_UPGRADE_URL=https://github.com/manasgandy/joinmarket-gui/archive/refs/tags/%JMG_VERSION.tar.gz | ||
|
manasgandy marked this conversation as resolved.
Outdated
|
||
| CURRENT="" | ||
| if [ -f $JMG_VERSION_FILE ]; then | ||
| CURRENT=$(cat $JMG_VERSION_FILE) | ||
| fi | ||
| if [ "$CURRENT" != "$JMG_VERSION" ]; then | ||
| # Download and build JoinMarket GUI | ||
| cd /home/joinmarket | ||
|
|
||
| # Delete previous version | ||
| rm -rf jmg | ||
|
|
||
| sudo -u joinmarket wget $JMG_UPGRADE_URL -O jmg.tar.gz | ||
| sudo -u joinmarket tar -xvf jmg.tar.gz | ||
| sudo -u joinmarket rm jm.tar.gz | ||
| mv jmg-* jmg | ||
| cd jmg | ||
|
|
||
| # Install dependencies | ||
| sudo -u joinmarket python3 -m venv jmg_venv | ||
| sudo -u joinmarket ./jmg_venv/bin/pip install -r requirements.txt | ||
|
|
||
| # Setup TLS certificates | ||
| sudo -u joinmarket mkdir .joinmarket/ssl | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There may be a way to re-use an existing cert. I'll need to think about this more. |
||
| sudo -u joinmarket openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -batch -out /home/joinmarket/.joinmarket/ssl/cert.pem -keyout /home/joinmarket/.joinmarket/ssl/key.pem | ||
|
|
||
| echo $JMG_VERSION > $JMG_VERSION_FILE | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| # Install Whirlpool | ||
| if should_install_app "whirlpool" ; then | ||
| WHIRLPOOL_UPGRADE_URL=https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads/$WHIRLPOOL_UPLOAD_FILE_ID/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -319,5 +319,9 @@ | |
| "short_name": "ufw", | ||
| "show_on_application_page": false, | ||
| "journalctl_log_name": "ufw" | ||
| }, | ||
| { | ||
| "name": "Joinmarket GUI", | ||
| "short_name": "jmg" | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In case there are issues, I think adding it as a "standalone" app that shows up on the application page may be better for users. Maybe follow a pattern similar to LNDConnect or Pool. |
||
| ] | ||
Uh oh!
There was an error while loading. Please reload this page.