3wc
8586b85095
Merge branch 'master' into yolocolo
2021-07-21 20:38:36 +02:00
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
b2b78e0015
Merge branch 'yc-templates' into yolocolo
2021-07-21 11:43:17 +02:00
3wc
d6f4be8197
Improve form styling
2021-07-21 11:43:04 +02:00
3wc
157e81e6e5
Merge branch 'yc-templates' into yolocolo
2021-07-21 02:02:58 +02:00
3wc
97f9486ea3
Remove cash payment option
2021-07-21 02:02:21 +02:00
3wc
4b90a6c7ae
Merge branch 'yc-templates' into yolocolo
2021-07-21 01:56:45 +02:00
3wc
adc3342a8c
Further colour tweak
2021-07-21 01:56:36 +02:00
3wc
f8bbdcc3c5
Merge branch 'yc-templates' into yolocolo
2021-07-21 01:54:35 +02:00
3wc
1133caa8a4
Fix typo, tweak colours
2021-07-21 01:54:21 +02:00
3wc
1f384f34b5
Merge branch 'yc-templates' into yolocolo
2021-07-21 01:44:52 +02:00
3wc
c25d85bbdd
More cheeky template changes
2021-07-21 01:44:45 +02:00
3wc
0f4ac8e444
Merge branch 'yc-templates' into yolocolo
2021-07-21 01:15:51 +02:00
3wc
3cf501a393
Disco updates for YOLOCOLO site
2021-07-21 01:13:52 +02:00
3wc
180efa01af
Merge branch 'optional-btcpay' into yolocolo
2021-07-21 00:30:34 +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
3wc
f5c079ffc2
Un-hard-code SSH key name
2021-07-20 23:55:03 +02:00
3wc
0e5dfe6bde
Last re-hard-coding for "working" joy
2021-07-20 23:55:03 +02:00
3wc
2adbb8d94c
Further filthy fix for local libvirt
2021-07-20 23:55:03 +02:00
3wc
8446d11720
Revert hardcoded local path to tank dir
2021-07-20 23:55:03 +02:00
3wc
a580b04659
Bag of hacks to get local libvirt working
2021-07-20 23:55:03 +02:00
3wc
2e6894ad14
Changes from @decentral1se code review
2021-07-20 23:48:23 +02:00
b8279d7491
add about ssh link to faq
2021-07-19 18:09:02 -05:00
3wc
be6c1b38b7
STRIPE_SECRET_KEY not STRIPE_PUBLISHABLE_KEY
2021-07-19 01:17:18 +02:00
3wc
aa8e129913
Load secrets from files if _FILE vars are set
2021-07-19 00:24:22 +02: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
