3wordchant
/
capsul-flask
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
312 Commits 16 Branches 0 Tags 970 KiB
Commit Graph

312 Commits

Author SHA1 Message Date
3wordchant abe768a521 Merge branch 'master' into docker
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is failing Details
2021-07-22 01:17:02 +02:00
3wordchant 5bb76173dd Add custom themes, THEME setting, basic "yolocolo" theme (#7) 
Specify `THEME=yourtheme`, add some HTML files in `capsulflask/theme/yourtheme` 👌

We probably want to reduce copypasta in the current `yolocolo` theme by using template inheritance, at some point.

Reviewed-on: #7
Co-authored-by: 3wordchant <3wordchant@noreply.git.autonomic.zone>
Co-committed-by: 3wordchant <3wordchant@noreply.git.autonomic.zone>
 2021-07-22 01:15:39 +02:00
3wordchant 18294cec43 Merge branch 'master' into docker
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is passing Details
2021-07-22 01:13:53 +02:00
3wc 982556a2c5 Tag with current branch, instead of `latest`
continuous-integration/drone/pr Build was killed Details
continuous-integration/drone/push Build is passing Details
2021-07-22 00:28:33 +02:00
3wc 13646e64da Make docker-compose file less demanding
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is passing Details
2021-07-21 23:50:47 +02:00
3wc 67149f437a Changes from @decentral1se code review 2021-07-21 23:50:47 +02:00
3wc 308ac05fe6 Add openssh-cient to Dockerfile for ssh-keyscan 2021-07-21 23:50:47 +02:00
3wc c378c2b287 STRIPE_SECRET_KEY not STRIPE_PUBLISHABLE_KEY 2021-07-21 23:50:47 +02:00
3wc 5367822747 Load secrets from files if _FILE vars are set 2021-07-21 23:50:47 +02:00
3wc e295b4420c Docker updates for libvirtd 2021-07-21 23:50:47 +02:00
3wc e4180b8306 Use Flask server in development 2021-07-21 23:50:47 +02:00
3wc 5cd5126039 Multi-stage build oh my! 2021-07-21 23:50:47 +02:00
3wc f8e9ab2482 Initial attempt at Docker 2021-07-21 23:50:47 +02:00
forest 8c0c613392 Merge remote-tracking branch 'threewordchant/master' 2021-07-21 16:47:46 -05:00
forest 50ee1144f9 Merge remote-tracking branch 'threewordchant/master' 2021-07-21 16:46:50 -05:00
3wc c4ba5ea197 Merge branch 'master' of ssh://git.autonomic.zone:2222/3wordchant/capsul-flask 2021-07-21 23:46:37 +02:00
forest 08eb38dc57 correctly enforce affordable_vm_sizes post form submission 2021-07-21 16:45:53 -05:00
3wc 33f4551cf4 Merge branch 'docs-reshuffle' 2021-07-21 23:44:42 +02:00
3wc 0fa7fb28b5 Split README up into separate files, plus: 
* forest's ReadMe docs changes
* add Configuration-type-stuff that lives in the database
 2021-07-21 23:43:44 +02:00
forest be6e72028c define BTCPAY_ENABLED based on URL and btcpay key, pass it explicitly 2021-07-21 23:43:44 +02:00
3wc bf7487f4f0 Don't load /btcpay if BTCPAY_PRIVATE_KEY un-set 2021-07-21 23:43:44 +02:00
3wc 8b0ce0ba71 Hide the BTCPay link if BTCPAY_PRIVATE_KEY un-set 2021-07-21 23:43:44 +02:00
3wc bca570882e 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 23:43:44 +02:00
forest f3ae9aae23 remove class="small" from pricing table cuz normal size fits fine 2021-07-21 23:43:44 +02:00
3wc 827ca4a50b Auto-generate the pricing table from the database 2021-07-21 23:43:44 +02:00
3wordchant f999adaf71 Add VMs to the database even with HUB_MODE=mock (#6) 
https://todo.cyberia.club/~cyberia/services/83

Co-authored-by: 3wc <3wc.cyberia@doesthisthing.work>
Co-authored-by: forest <forest.n.johnson@gmail.com>
Reviewed-on: #6
Co-authored-by: 3wordchant <3wordchant@noreply.git.autonomic.zone>
Co-committed-by: 3wordchant <3wordchant@noreply.git.autonomic.zone>
 2021-07-21 23:26:10 +02:00
3wc 8f2becb9ee Fix SyntaxWarning on `is not ""` 
`capsulflask/__init__.py:143: SyntaxWarning: "is not" with a literal. Did you mean "!="?`
 2021-07-21 21:51:50 +02:00
3wordchant f848eda931 Merge pull request 'Disable BTCPay in the interface, if BTCPAY_PRIVATE_KEY is un-set' (#3) from optional-btcpay into master 
Reviewed-on: #3
 2021-07-21 20:20:40 +02:00
3wordchant 46f49e8d8f Merge pull request 'Auto-generate the pricing table from the database' (#4) from generated-prices into master 
Reviewed-on: #4
 2021-07-21 19:32:09 +02:00
forest 36329796f0 define BTCPAY_ENABLED based on URL and btcpay key, pass it explicitly 2021-07-21 12:12:41 -05:00
forest 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
forest b8279d7491 add about ssh link to faq 2021-07-19 18:09:02 -05:00
forest 908d02803f move hardcoding public3 to the right place 2021-07-12 16:10:28 -05:00
forest 6e6bd2b143 fix syntax error 2021-07-12 16:00:37 -05:00
forest 47fbaab403 hardcode network_name=public3 to sidestep phantom dhcp lease issues 2021-07-12 15:59:20 -05:00
forest 06a2bd3a6f add public_ipv4_first_usable_ip, public_ipv4_last_usable_ip 2021-07-12 14:38:56 -05:00
forest fbe9c7fca4 fix last IP address hanging off the end of the display on admin page 2021-07-12 12:27:07 -05:00
forest 6bdb133153 make admin display work better on phones 2021-07-12 12:23:27 -05:00
forest b459e56f3a use the provided network_name when creating a capsul 2021-07-12 12:19:56 -05:00
forest be54117736 migration 17: network_name -> virtual_bridge_name, add network_name col 2021-07-12 12:16:32 -05:00
forest aaf33a245b point capsul at new public3/virbr3 network 2021-07-12 11:29:37 -05:00
forest ad9c3476c7 simplify cidr block logic a little bit 2021-07-12 11:29:33 -05:00
forest fcbea1e29b fixing capsul creation after I broke it with the pre-allocated IP 
address changes
 2021-07-11 12:18:58 -05:00
forest a2f2e744e4 MAIL_USE_TLS=False, MAIL_USE_SSL=True defaults 2021-07-11 10:28:47 -05:00
forest 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
forest c216c5b992 adjust admin display 2021-07-09 14:52:46 -05:00