7ba1c55609
Biling page: moved user classification logic from template → view code
...
This is the kind of stuff that's much easier expressed in Python than in
the template code.
API calls removed:
- fetching the user isn't necessary, since we have
pillar.auth.current_user anyway.
- a call for each group the user is member of, since we only used it to
check whether the user has demo access anyway.
2018-01-25 14:06:13 +01:00
33aa819040
Override Roles & Caps explanation with something more specific for Cloud
2018-01-25 14:06:13 +01:00
70f28074a0
Use Jinja2 inheritance to render user settings pages.
...
This requires Pillar e55d38261b36756a2850716a453c08c9ee6be9e2 or newer.
2018-01-25 14:06:13 +01:00
14d77da47a
store.blender.org → EXTERNAL_SUBSCRIPTIONS_MANAGEMENT_SERVER
...
I've only done this on the billing page, because there it's important
for debugging purposes to know which URL was actually checked to obtain
the subscription expiry information.
2018-01-25 14:06:13 +01:00
0908a13519
Avoid error when Store cannot be reached.
2018-01-25 14:06:13 +01:00
06414ab0ed
Override for comments_for_node
...
Make use of the render_comments_for_node function, and define custom logic to determine the value of can_post_comments.
2018-01-20 00:45:57 +01:00
67ce16fc78
Limit video max-width in homepage blog list
2018-01-18 11:57:53 +01:00
d00c32310b
Update stats URL to the new Kibana dashboard.
2018-01-12 14:03:42 +01:00
add20f0c6c
Fixed indentation
2018-01-12 12:33:48 +01:00
dde590d388
gulp: Don't pass --production to Pillar's gulp when deploying
2018-01-12 12:24:39 +01:00
996beaf090
Bump version of elasticproxy to 1.2
2018-01-12 11:55:13 +01:00
37b84cf75a
Upgraded ElasticSearch and Kibana to 6.1.1
...
Requires a reset + reindex of everything (well, that's the easiest way to
get things indexed properly again), which will loose us the Cloud stats.
Before doing this, export those to MongDB and upgrade the statscollector
to the version that I'll be committing soon.
2018-01-12 11:55:13 +01:00
eb2a058ce2
Python 3.6.3 → 3.6.4
2018-01-12 11:55:13 +01:00
4891803552
Docker: never cache the base image when rebuilding
2018-01-12 11:55:13 +01:00
ab11f98331
Removed notifserv from docker-compose.yml
2018-01-12 11:55:13 +01:00
0ed03240e7
Made docker-compose.yml indentation consistent.
2018-01-12 11:55:07 +01:00
5c26756626
remove algolia
2018-01-12 11:54:39 +01:00
de6cdbaf19
Fixed broken networking with new docker-compose.yml
...
- No more 'links', all dockers can reach each other by name
- Added 'depends_on', which handles startup sequence
- Allowed haproxy connection to the docker daemon socket
- Told haproxy explicitly which services to proxy. The 'docker:' prefix
comes from the fact that the directory containing the docker-compose.yml
file is called 'docker'.
2018-01-03 15:27:28 +01:00
e641565e6a
Docker: Limit logging for celery worker
2017-12-22 11:58:47 +01:00
617b600ce8
Upgraded docker-compose.yaml file format from 1 to 3.4
...
This allows us to set logging options, which weren't available in version 1.
I've also added newlines around each service definition, and made the
formatting consistent across the entire file (using align-yaml, one of the
tools of the atom-beautify plugin for Atom).
2017-12-22 11:54:06 +01:00
4c2632669b
PEP8 formatting
2017-12-21 15:26:32 +01:00
c2518e9ae1
Send welcome email to new Cloud subscribers
2017-12-21 15:26:23 +01:00
0b34c5c1c6
Also create user when member of organisation
2017-12-20 14:22:26 +01:00
fd68f3fc8b
Allow user creation from Blender ID webhook "user modified"
...
When the webhook indicates that the user has a Cloud subscription (demo,
active, or renewable), the user is immediately created.
2017-12-20 12:56:48 +01:00
a2c24375e5
Webhooks: smarter way to find the user the webhook applies to.
...
We now also match on Blender ID (through the 'auth' section of the user
document), so that even when we have missed an email change we can still
apply the changes from the webhook.
2017-12-20 12:22:51 +01:00
16e378b7ad
Removed unit test for unknown emails
...
This behaviour is going to change, and by splitting that change up into
two commits the diff makes much more sense.
2017-12-20 11:43:07 +01:00
be4b36a661
Also accept user-modified webhook when old email address is unknown.
...
When the old email address is unknown, and the new one does map to a user,
use the webhook to update the new user.
2017-12-20 11:40:56 +01:00
ae700b5eef
Added payload description of Blender ID webhook
2017-12-20 11:19:15 +01:00
3712ad6ddc
Added test for store.py
2017-12-19 11:09:45 +01:00
b2cad0fb9a
Fixed mistake in capability check
2017-12-19 10:51:59 +01:00
5e15185166
HaProxy: Explicitly configure allowed TLS ciphers
2017-12-13 14:00:51 +01:00
2a35c3e157
Deploy script: notify Sentry instead of Bugsnag of the deploy
2017-12-13 12:50:45 +01:00
8a4f6c3649
Switch from macros to blocks for navigation menus
...
For more informations see a7693aa78dcf0a0a77e113f34afa63fb4f615441 in pillar.git
2017-12-13 11:13:47 +01:00
9c2e6f9081
Fixed forced login for user switching
2017-12-12 11:25:48 +01:00
be62a38cd5
Merge branch 'production'
2017-12-12 10:22:14 +01:00
501fb76c7e
Revert "Revert "Removed flamenco-user and attract-user role linking to subscriber/demo/admin""
...
This reverts commit d46b5d645b
2017-12-12 10:22:07 +01:00
d46b5d645b
Revert "Removed flamenco-user and attract-user role linking to subscriber/demo/admin"
...
Temporarily reverting due to an issue with missing roles and permissions.
This reverts commit c031c1e8ae
2017-12-08 17:42:35 +01:00
5efca08c13
Docker Apache: added svnman XSendFilePath
2017-12-08 17:06:56 +01:00
abb0ded3f2
Lowered log level for webhook call for unknown user
2017-12-08 14:08:04 +01:00
f948969b20
Fixed webhook so that users' full_name isn't reset to the empty string.
2017-12-08 14:04:11 +01:00
1ae090789b
Deploy: added PermitLocalCommand=no to SSH command
...
I'm using a LocalCommand invocation to change the terminal colours when
I SSH into a production server; this shouldn't be done by the deploy
script.
2017-12-08 10:12:55 +01:00
c031c1e8ae
Removed flamenco-user and attract-user role linking to subscriber/demo/admin
...
It was a hack due to the lack of a capabilities system.
2017-12-07 17:09:06 +01:00
00805c3372
Upgraded Python to 3.6.3
2017-12-07 14:02:35 +01:00
035382d1e5
docker: allow running 1_base/build.sh with --no-cache
...
This rebuilds the image from scratch, also pulling in security updates.
2017-12-07 14:02:20 +01:00
7dcc0d5ead
Size-based Apache log rotation
2017-12-07 10:21:55 +01:00
bff51e1e83
Added /renew endpoint to redirect to Blender Store renewal URL.
2017-12-06 14:36:02 +01:00
561db0428d
Using new blender_id.get_user_blenderid() function
2017-12-05 11:56:33 +01:00
f7ce8d74a7
Implemented Blender ID webhook for user change notifications
...
Handles changes in:
- roles
- full name
- email address
2017-12-01 19:06:16 +01:00
532bf60041
Obtain subscription info from Store.
...
This was in Pillar, and is now moved to Blender Cloud. It's used to obtain
the subscription expiration date from Blender Store.
2017-11-30 15:45:40 +01:00
d5d189de8c
Reworked subscription reconciliation to use Blender ID instead of Store
2017-11-30 15:30:41 +01:00
