Commit Graph

323 Commits

Author SHA1 Message Date
f848eda931 Merge pull request 'Disable BTCPay in the interface, if BTCPAY_PRIVATE_KEY is un-set' (#3) from optional-btcpay into master
Reviewed-on: 3wordchant/capsul-flask#3
2021-07-21 20:20:40 +02:00
46f49e8d8f Merge pull request 'Auto-generate the pricing table from the database' (#4) from generated-prices into master
Reviewed-on: 3wordchant/capsul-flask#4
2021-07-21 19:32:09 +02:00
36329796f0 define BTCPAY_ENABLED based on URL and btcpay key, pass it explicitly 2021-07-21 12:12:41 -05:00
28271ee852 remove class="small" from pricing table cuz normal size fits fine 2021-07-21 11:53:44 -05:00
3wc
7923f3a99f Auto-generate the pricing table from the database 2021-07-21 12:19:28 +02:00
3wc
7ed847251f Don't load /btcpay if BTCPAY_PRIVATE_KEY un-set 2021-07-21 00:22:58 +02:00
3wc
e3a4776a5d Hide the BTCPay link if BTCPAY_PRIVATE_KEY un-set 2021-07-21 00:20:38 +02:00
3wc
357d99cb91 Add load_config_vars context processor..
..to allow accessing config variables in the templates.

This removes the need for adding config variables manually to template
contexts.
2021-07-21 00:19:38 +02:00
b8279d7491 add about ssh link to faq 2021-07-19 18:09:02 -05:00
908d02803f move hardcoding public3 to the right place 2021-07-12 16:10:28 -05:00
6e6bd2b143 fix syntax error 2021-07-12 16:00:37 -05:00
47fbaab403 hardcode network_name=public3 to sidestep phantom dhcp lease issues 2021-07-12 15:59:20 -05:00
06a2bd3a6f add public_ipv4_first_usable_ip, public_ipv4_last_usable_ip 2021-07-12 14:38:56 -05:00
fbe9c7fca4 fix last IP address hanging off the end of the display on admin page 2021-07-12 12:27:07 -05:00
6bdb133153 make admin display work better on phones 2021-07-12 12:23:27 -05:00
b459e56f3a use the provided network_name when creating a capsul 2021-07-12 12:19:56 -05:00
be54117736 migration 17: network_name -> virtual_bridge_name, add network_name col 2021-07-12 12:16:32 -05:00
aaf33a245b point capsul at new public3/virbr3 network 2021-07-12 11:29:37 -05:00
ad9c3476c7 simplify cidr block logic a little bit 2021-07-12 11:29:33 -05:00
fcbea1e29b fixing capsul creation after I broke it with the pre-allocated IP
address changes
2021-07-11 12:18:58 -05:00
a2f2e744e4 MAIL_USE_TLS=False, MAIL_USE_SSL=True defaults 2021-07-11 10:28:47 -05:00
79ef90c380 hub allocate capsul IP addr when the create operation is being claimed
create.sh will now be passed two extra arguments from the web app:

network_name and public_ipv4_address

network_name will be virbr1 or virbr2 or whatever the network is called
and public_ipv4_address will be an ipv4 from that network which is not
currently being used
2021-07-09 17:08:51 -05:00
c216c5b992 adjust admin display 2021-07-09 14:52:46 -05:00
47cdb0c7e6 hotfix support MAIL_USE_SSL 2021-07-09 14:44:48 -05:00
74d77224f7 finishing touches and fixes on managed IPs database migration 16 2021-07-09 14:35:23 -05:00
862b14545b more managed ips work: cli sql improvements, added admin panel 2021-07-09 14:13:28 -05:00
e685c8a773 start working on managed IPs 2021-07-08 14:10:14 -05:00
1e19902df1 fix syntax error and beeteeceepae2 warning formatting 2021-07-07 21:12:31 -05:00
a08edd870f add beeteeceepae2 message to btcpay launch page & cleanup 2021-07-07 21:04:23 -05:00
a42d35be51 more fixing default values for quick start 2021-07-07 15:17:00 -05:00
bdabd61057 fix defaults for running locally and make email server not required. 2021-07-07 13:47:21 -05:00
3cb6992359 don't crash if btcpay key is invalid: log warning msg 2021-06-27 10:46:48 -05:00
ebf338eb12 don't crash if btcpay key is invalid 2021-06-27 10:41:46 -05:00
j3s
e6cba96d2d Correct default email settings 2021-06-27 10:40:34 -05:00
j3s
6f265f5c8a Move back to public1 for more availability 2021-06-24 14:18:55 -05:00
e23dd7f776 Move to public2, more free space 2021-05-15 14:49:36 +00:00
961bb4976b remove newlines and strip content first before parsing ssh key name 2021-05-12 12:21:26 -05:00
4590671984 improve invalid ssh key name error message 2021-05-12 12:18:39 -05:00
e3e1059ba1 allow colons in ssh key names 2021-05-12 12:14:55 -05:00
9d6fe075b0 Merge remote-tracking branch 'origin/master' 2021-05-12 11:49:25 -05:00
71db4b3333 allow colons in ssh key comments and adjust ssh key whitespace handling 2021-05-12 11:48:55 -05:00
525de7450e Correct ip detection logic, flip network to public1 (capacity issues) 2021-04-20 22:20:44 +00:00
46a691b876 temporarily disable serializable transactions
until this can get figured out better
2021-03-23 16:03:48 -05:00
c623c65fda Limit the utilization of serializable transactions
A user encountered this error when deleting a vm:

self.cursor.execute("UPDATE vms SET deleted = now() WHERE email = %s AND
id = %s", ( email, id))

psycopg2.errors.SerializationFailure: could not serialize access due to
read/write dependencies among transactions
2021-03-23 15:59:17 -05:00
107a5fc659 attempting to fix "can't look up exception for http status 200" 2021-03-23 15:57:07 -05:00
8717ad477e Revert "fix postgres serializable transaction"
This reverts commit 0a70ea8a95.
2021-03-21 12:28:19 -05:00
1136e2436b baikal memory upgrade and patchign to changelog 2021-03-21 12:25:24 -05:00
6eb959bd12 Revert "Add notice"
This reverts commit 7f5b431364.
2021-03-21 12:16:25 -05:00
0a70ea8a95 fix postgres serializable transaction 2021-03-21 12:16:17 -05:00
j3s
7f5b431364 Add notice 2021-03-08 19:31:05 -06:00
j3s
040c36bbaf Adjust capacity warning to 20GB 2021-03-08 19:24:47 -06:00
a09c82ecfc Merge remote-tracking branch 'origin/master' 2021-02-21 14:26:29 -06:00
0320bb5e29 fix potential exceptions in error handler 2021-02-21 14:26:00 -06:00
b32db058f0 fix http session being used inside hub model 2021-02-21 14:22:14 -06:00
j3s
ca0f9d1a41 Remove ssh host key spacing 2021-02-18 11:13:58 -06:00
j3s
c8dd3d2e80 Correct ssh pubkey spacing 2021-02-18 11:12:51 -06:00
70628039c4 fix wrong var name 2021-02-17 21:57:57 -06:00
88905b944d clean up massive onliner 2021-02-17 21:57:09 -06:00
fa0ddad5f5 fix missing paren 2021-02-17 21:46:46 -06:00
2cca908d79 add to changelog 2021-02-17 21:45:29 -06:00
1de0388df2 fine-tuning vm list page ip display depending on state 2021-02-17 21:29:03 -06:00
5d3dbac9ba fixing more bash issues 2021-02-17 21:22:01 -06:00
64db728731 fixing bash if statement issues related to negation 2021-02-17 21:19:27 -06:00
8d5e3d007d add warnings when get.sh fails 2021-02-17 21:15:23 -06:00
ea1eec7f92 fixing exception in capsul detail 2021-02-17 21:10:20 -06:00
bf927c4f1e fix line before shebang in script and fine-tune list page style 2021-02-17 21:06:20 -06:00
fd5d23cf22 prevent keyError when double_check_capsul_address returns None 2021-02-17 20:56:52 -06:00
ba0b29462c first try at implementing the vm start and stop feature 2021-02-17 20:50:17 -06:00
e8348052a8 fixing get inconsistency and adding vm_state_command 2021-02-16 21:13:51 -06:00
j3s
2e265703bd Add vm state management scripts 2021-02-16 20:58:23 -06:00
dbff6e23ed simplify postgres connection parameters as a single string 2021-02-16 16:08:54 -06:00
f7d4b485a5 missed a spot 2021-02-15 23:52:52 -06:00
9389c80cb6 fixing error messages and naming functions better 2021-02-15 23:51:59 -06:00
0de5305eac explain error from vms with no ip yet 2021-02-15 21:17:10 -06:00
e55798494b pig snorting sounds 2021-02-15 21:10:57 -06:00
f75575313b fix merge missing "fix index out of range when parsing output from
shell_scripts/get.sh"
2021-02-15 21:08:44 -06:00
2bc5b10284 add INTERNAL_HTTP_TIMEOUT_SECONDS option 5min default 2021-02-15 21:00:34 -06:00
bf281b12e1 copy and paste error 2021-02-15 20:35:49 -06:00
ab4c94e37c correctly test for none result in double_check_capsul_address 2021-02-15 20:32:24 -06:00
af272a6b70 Revert "temporarily thow exception from check capsul addr"
This reverts commit 1fd3ccb8a3.
2021-02-15 20:27:17 -06:00
05d5b15c4a oops I was thinking golang dont assign append it returns None 2021-02-15 20:20:42 -06:00
1fd3ccb8a3 temporarily thow exception from check capsul addr 2021-02-15 20:13:04 -06:00
47b2b3ee13 introduce InterThreadResult to ensure that current_app is only accessed
from the main flask thread
2021-02-15 20:06:35 -06:00
0a70c974ec ssh_public_keys -> ssh_authorized_keys rename (merge fix) 2021-02-15 19:44:26 -06:00
8d0088ef13 fix version #s 2021-02-15 19:24:31 -06:00
534855c764 correctly merge db migrations with origin master (coreos) 2021-02-15 19:19:20 -06:00
4c9a492ae3 remove wishful thinking type anotation 2021-02-15 18:35:44 -06:00
cc164dce01 manually merging in the sshkeys to the spoke model/hub model interface 2021-02-15 18:16:15 -06:00
44ee42764c delete unused virt model 2021-02-15 18:05:17 -06:00
b1129a8355 manually merging the spoke model / virt model changes 2021-02-15 18:05:01 -06:00
1c6d7eb380 eclipse failed to add deleted files 2021-02-15 17:52:31 -06:00
dad6547825 Merge branch 'master' into multiple-hosts
Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py
2021-02-15 17:52:17 -06:00
j3s
4b3f3603cc CoreOS isnt ready 2021-02-01 12:27:22 -06:00
j3s
3639a295c4 Add coreos 2021-02-01 10:59:13 -06:00
645ddede02 fix a bug where accumulating stale login tokens can lock out an account 2021-01-31 18:02:46 -06:00
cbe658b7ae clarify cloud based use case for hypothetical non-tofu ssh 2021-01-31 02:31:27 -06:00
51721ffdc0 wording 2021-01-31 02:20:20 -06:00
7568699920 clearly specify that its about the default ssh config 2021-01-31 02:16:13 -06:00
9222daefbc fix wording 2021-01-31 02:13:55 -06:00
a853eeef69 replace nonsensical namecoin plug with "Why ssh more ssh" 2021-01-31 02:09:42 -06:00