amal/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
757 commits 4 branches 17 tags 11 MiB
Commit graph

757 commits

This branch
This branch
All branches
Author SHA1 Message Date
fnux
839bd5f8a9 Merge branch 'vm-ordering-disk' into 'master' 
Wire disk images to VM creation/ordering, make Order records transparents

See merge request uncloud/uncloud!4
 2020-04-18 08:32:07 +02:00
Timothée Floure
aa0702faba Add chromium to path on CI environment 2020-04-13 12:06:03 +02:00
Timothée Floure
9a57153c4e Commit missing migrations 2020-04-13 12:02:49 +02:00
Timothée Floure
f5897ed4b1 Adapt recurring price of VM and Matrix to new scheme 2020-04-13 12:00:59 +02:00
Timothée Floure
14f59430bb Restore Order.add_record, used by uncloud_pay tests 2020-04-13 11:54:41 +02:00
Timothée Floure
05f8f1f6c0 Fix dependency issue in CI job 2020-04-13 11:40:19 +02:00
Timothée Floure
1a58508f8b Rename ungleich_service into uncloud_service 2020-04-13 11:39:49 +02:00
Timothée Floure
e67bd03997 Migration fix after rebase 2020-04-13 11:19:18 +02:00
Timothée Floure
a4cc4304f9 Adapt managed service to create VMDiskProduct 2020-04-13 11:19:18 +02:00
Timothée Floure
d3b7470294 Wire disk images to VM creation/ordering 2020-04-13 11:19:18 +02:00
Timothée Floure
a7e9f3c09d Move Order.add_record to save hook in abstract Product 2020-04-13 10:42:44 +02:00
Nico Schottelius
ff133e81b7 [vpn] update to show reservations, create wireguard config 2020-04-12 22:55:22 +02:00
Nico Schottelius
85b4d70592 [vpn] make a vpn creat-able! 
[15:40] line:~% http -a nicoschottelius:$(pass ungleich.ch/nico.schottelius@ungleich.ch)  http://localhost:8000/net/vpn/ network_size=48  wireguard_public_key=$(wg genkey | wg pubkey)
HTTP/1.1 201 Created
Allow: GET, POST, HEAD, OPTIONS
Content-Length: 206
Content-Type: application/json
Date: Sun, 12 Apr 2020 13:40:26 GMT
Server: WSGIServer/0.2 CPython/3.7.3
Vary: Accept
X-Content-Type-Options: nosniff
X-Frame-Options: DENY

{
    "extra_data": null,
    "network": "2a0a:e5c1:203::",
    "order": null,
    "owner": 30,
    "status": "PENDING",
    "uuid": "8f977a8f-e06a-4346-94ae-8f525df58b7b",
    "wireguard_public_key": "JvCuUTZHm9unasJkGsLKN0Bf/hu6ZSIv7dnIGPyJ6xA="
}
 2020-04-12 15:40:39 +02:00
Nico Schottelius
b55254b9b1 Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2020-04-12 14:28:39 +02:00
Nico Schottelius
bc033a9087 Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2020-04-12 11:36:51 +02:00
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
Nico Schottelius
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
Timothée Floure
276c7e9901 Set VM order starting date on creation 2020-04-09 14:52:56 +02:00
Timothée Floure
3a37343a73 Set default value for vpnnetworkreservation, rebuild migrations 2020-04-09 14:28:46 +02:00
Timothée Floure
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
Timothée Floure
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
Nico Schottelius
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
Timothée Floure
cc7056c87c Remove old Stripe settings from secrets_sample.py 2020-04-08 17:55:48 +02:00
Timothée Floure
a8b81b074b Remove user view from uncloud_pay 2020-04-08 17:40:44 +02:00
Timothée Floure
89c705f7d2 Set one payment method as primary, allow updates 2020-04-08 17:22:53 +02:00
Timothée Floure
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