Commit graph

692 commits

Author SHA1 Message Date
Nico Schottelius
05f38d157e add a discounter function to the product model 2020-04-12 11:35:37 +02:00
Nico Schottelius
bab59b1879 Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2020-04-11 21:37:50 +02:00
Nico Schottelius
50b8b7a5f6 in-between commit 2020-04-11 21:37:36 +02:00
f1bba63f6f Merge branch 'yearly-billing' into 'master'
Implement yearly billing, general billing tests

See merge request uncloud/uncloud!5
2020-04-11 21:37:13 +02:00
276c7e9901 Set VM order starting date on creation 2020-04-09 14:52:56 +02:00
3a37343a73 Set default value for vpnnetworkreservation, rebuild migrations 2020-04-09 14:28:46 +02:00
3588ae88f9 Merge branch 'master' into HEAD 2020-04-09 14:10:01 +02:00
Nico Schottelius
9431f11284 ++notes 2020-04-09 12:09:38 +02:00
Nico Schottelius
e64c2b8ddb Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2020-04-09 12:08:17 +02:00
Nico Schottelius
d9473e8f33 ++ doc 2020-04-09 12:08:11 +02:00
cb3346303b Fix typo in migration dependencies for uncloud_pay 2020-04-09 12:06:05 +02:00
Nico Schottelius
7d892daff9 [db] stay on psql+socket 2020-04-09 11:59:49 +02:00
Nico Schottelius
08b9886ce3 Remove sample secret key in secrets_sample
No need to worry, this was just a testing key
2020-04-09 11:59:25 +02:00
d6bdf5c991 Merge branch 'sync-old-meowpay-patches' into 'master'
Revamped payment pipeline (imported from nico/mew-cloud)

See merge request uncloud/uncloud!3
2020-04-09 11:31:49 +02:00
cc7056c87c Remove old Stripe settings from secrets_sample.py 2020-04-08 17:55:48 +02:00
a8b81b074b Remove user view from uncloud_pay 2020-04-08 17:40:44 +02:00
89c705f7d2 Set one payment method as primary, allow updates 2020-04-08 17:22:53 +02:00
f2a797874a Merge branch 'master' into stripe-js 2020-04-08 17:08:09 +02:00
Nico Schottelius
d3f2a3e071 in between commit
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-08 16:24:39 +02:00
Nico Schottelius
3d2f8574d3 [db] use tcp -> support ssh 2020-04-08 13:09:17 +02:00
Nico Schottelius
1838eaf7dd Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2020-04-08 12:07:11 +02:00
Nico Schottelius
8986835c7e Add readme for postgresql support 2020-04-08 12:03:18 +02:00
Nico Schottelius
938f0a3390 update to work on different computer
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-07 19:45:16 +02:00
Nico Schottelius
913e992a48 [vpn] fix urls 2020-04-06 22:30:01 +02:00
Nico Schottelius
096f7e05c0 [migration] new models for uncloud_net 2020-04-06 22:29:41 +02:00
Nico Schottelius
06c4a5643c [doc] move readme to subdir 2020-04-06 22:08:29 +02:00
Nico Schottelius
198aaea48a Remove unused ldaptest 2020-04-06 22:06:48 +02:00
Nico Schottelius
d537e9e2f0 [doc] add new readme's 2020-04-06 22:06:34 +02:00
Nico Schottelius
5d084a5716 phase in vpn
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-03 19:27:49 +02:00
Nico Schottelius
8fb3ad7fe8 inline all pictures 2020-04-03 18:51:09 +02:00
Nico Schottelius
c44faa7a73 Begin to include bill output 2020-04-03 18:41:17 +02:00
Nico Schottelius
fa0ca2d9c1 Merge remote-tracking branch 'meowpaylocal/master' 2020-04-02 19:31:57 +02:00
Nico Schottelius
7a6c8739f6 Rename / prepare for merge with uncloud repo 2020-04-02 19:31:03 +02:00
Nico Schottelius
833d570472 sync .gitignore 2020-04-02 19:30:47 +02:00
Nico Schottelius
3cf3439f1c Move all files to _etc_based 2020-04-02 19:29:08 +02:00
Nico Schottelius
23203ff418 vmsnapshot progress 2020-03-22 20:55:11 +01:00
Nico Schottelius
9961ca0446 add new migrations
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-22 18:59:59 +01:00
Nico Schottelius
105142f76a Add template for creating VMs 2020-03-22 18:52:31 +01:00
Nico Schottelius
08fe3e689e Add debug to opennebula, create VM disks from opennebula correctly 2020-03-22 17:30:55 +01:00
Nico Schottelius
10c5257f90 Introduce "extra_data" jsonfield 2020-03-21 11:59:04 +01:00
Nico Schottelius
a32f7522b5 Relate VM to disks and snapshots 2020-03-18 15:43:01 +01:00
Nico Schottelius
4b4cbbf009 Also list snapshots for a VM 2020-03-18 15:19:06 +01:00
Nico Schottelius
c6a9bd4363 Make balance a user attribute + decimalfield 2020-03-18 14:53:26 +01:00
Nico Schottelius
cd01f62fde Move user view to uncloud_auth 2020-03-18 14:36:40 +01:00
Nico Schottelius
2f1aee8181 Can create a VMSnapshot w/ order (bugs to be removed) 2020-03-17 19:53:14 +01:00
Nico Schottelius
6a382fab23 [vmhost] add used_ram_in_gb 2020-03-17 19:07:00 +01:00
Nico Schottelius
b9473c1803 ++ fix opennebula migration 2020-03-17 16:03:41 +01:00
Nico Schottelius
cc2efa5c14 Remove old opennebula view, remove vmid field 2020-03-17 15:40:08 +01:00
Nico Schottelius
5d840de55c [opennebula] refresh formula, cleanup vm import/migration to uncloud 2020-03-17 15:39:24 +01:00
Nico Schottelius
9f4b927c74 Introduce mirations to ungleich_service to make tests work 2020-03-17 14:50:28 +01:00