Commit Graph

682 Commits

Author SHA1 Message Date
d80fc48635 Redirect properly after login
- Use next=xxx URL parameter
- Redirect to / when no next=xxx was given and the referrer is /welcome
2017-09-01 17:04:41 +02:00
9a49cb536b Run ./gulp script when deploying, rather than running gulp directly
This ensures dependencies are rebuilt when they changed.
2017-09-01 11:29:42 +02:00
a9280dd05f Introducing settings for blender-cloud
Moved Blender Cloud specific settings from Pillar into this application.
2017-08-30 23:13:06 +02:00
0b2583c22e Layout: Headers backdrops are no longer used 2017-08-30 15:42:03 +02:00
835851c1d7 Gulp: Fix livereload 2017-08-30 15:06:09 +02:00
1fb3c88a8f Override /login endpoint
For Blender Cloud we want to point directly to blender-id OAuth.
2017-08-25 11:56:43 +02:00
732fe7bc7c Fixed calls to do_badger to use keyword arguments for role(s)
- updated call to pass multiple roles at once
- updated call to pass single role with keyword arg

This requires Pillar 87afbc52f6c7d5eb63f0da745625d05b01e81783
2017-08-23 09:32:01 +02:00
838d85a2b7 Use capabilities system to check whether the user is a subscriber. 2017-08-22 16:40:05 +02:00
2e4ed6f3c8 Also allow demo users access to Flamenco & Attract 2017-08-15 15:25:53 +02:00
fd600c9fa0 Fix for broken url_for 2017-07-27 09:30:09 +02:00
7f65b77824 New redirect from /training to /courses 2017-07-26 16:51:35 +02:00
4575e8bf8b Public project changes
Now we organize training content into 'courses' and 'workshops'. This commit updates various endpoints and menus to reflect that decision.
2017-07-26 16:51:16 +02:00
fe408c3151 Moved projects index_collection from Pillar 2017-07-26 16:49:40 +02:00
9bf6a36bdd Return cached view for welcome page only if user is anonymous 2017-07-16 00:06:18 +02:00
560c13d3a8 Add node_modules to .gitignore 2017-07-16 00:05:35 +02:00
f33bb946ac Fix for static path 2017-07-14 12:57:58 +02:00
bda679a3bf Remove about.html
This is build with Gulp from a .pug file now.
2017-07-14 12:45:35 +02:00
0ea8b02920 Tweaks to rsync_ui.sh
Move Blender Cloud checks before Pillar deploy commands. Also add prefixes to distinguish between Pillar vs. cloud assets.
2017-07-14 12:44:32 +02:00
ae33a6f71e Moving Blender Cloud specific pages from Pillar
These pages were originally in the pillar repository, but they actually belong here. We also extended rsync_ui.sh to build and rsync to the Blender Cloud server.
2017-07-13 18:35:18 +02:00
f6df37ec24 Introducing the gulp command
From now on we work with .pug files for templates.
2017-07-13 18:26:54 +02:00
fca78faca0 Replace blurry image 2017-07-13 12:46:48 +02:00
c648fe0ca5 Thumbnails for Services page 2017-07-11 18:45:46 +02:00
b155b0916e CLI reconcile_users: process 10 users in parallel 2017-07-11 14:57:57 +02:00
f493d0a566 CLI reconcile_subscribers: show user count + index 2017-07-11 14:44:00 +02:00
093d80905f CLI reconcile_subscribers: show user count before starting 2017-07-11 14:40:46 +02:00
54e9aca16f CLI reconcile_subscribers uses do_badger & re-grants the subscriber role
This ensures that subscriber-linked roles like flamenco-user are synced
along with the subscriber status, and that Algolia picks up on those
changes as well.
2017-07-11 14:29:14 +02:00
3e5ad280b1 CLI command to create standard groups admin/demo/subscriber
This is part of what setup_db also does, but only for creating those
groups. Only really useful for debugging/developing.
2017-07-11 14:27:33 +02:00
0a9f0ebddb Roles '{flamenco,attract}-user' are now linked to 'subscriber'
All users who get 'subscriber' role automatically get 'flamenco-user' and
'attract-user', and when 'subscriber' is revoked, so are
'{flamenco,attract}-user'.
2017-07-11 12:40:13 +02:00
a43e84f93e Made script executable 2017-07-07 12:03:18 +02:00
56af1cd96c Added renewal script for Let's Encrypt 2017-07-07 12:02:49 +02:00
69862b8416 Docker: removed blender-cloud/.well-known from letsencrypt
That domain is handled by a different host.
2017-07-07 11:40:27 +02:00
b9a7f501ba Docker: Dropping support for cloudapi.blender.org 2017-07-07 11:40:25 +02:00
6fc77522ea Removed localhost declaration 2017-07-07 11:24:14 +02:00
538a10af60 Added docker container for serving letsencrypt webroot. 2017-07-07 11:23:38 +02:00
fd700ca6d9 Inject current_user_is_subscriber into Jinja context
This variable is set to True iff the user has a subscriber/demo/admin role.
It's an attempt to get some of the Cloud subscription specific stuff out
of Pillar.
2017-06-14 16:26:29 +02:00
e69ac4c5b9 Restart Celery worker after deploying new version. 2017-06-08 11:55:52 +02:00
a62d1e3d7d Updated celery-worker.sh to actually star the Celery worker. 2017-06-07 17:19:02 +02:00
d56e1afe73 Upgraded docker images Python 3.6.0 → 3.6.1 2017-06-07 13:22:57 +02:00
8b110df32a Convert all Redirects to RewriteRules in Apache conf
This allows for more precise redirection. Using the correct code (301, permanently moved) and L (Last rule, prevent any further evaluation).
2017-06-02 11:18:57 +02:00
9da841efc3 Added Celery worker docker container
This docker container uses the Blender Cloud image, but a different entry
point. It is not intended to be network-reachable from the outside world.
All it needs are connections to the databases (mongo, redis, rabbit).
2017-06-02 10:55:18 +02:00
c73efd5998 Added RabbitMQ, for serving as Celery broker. 2017-06-02 10:55:18 +02:00
93edfb789f Add Blender Cloud specific redirects
Originially hardcoded in Pillar, these redirects are rarely changed or added.
2017-06-01 17:27:00 +02:00
f0e53245a6 New images for the homepage 2017-05-22 16:01:35 +02:00
c775126cba Docker startup: create ${APACHE_LOG_DIR} if it doesn't exist yet 2017-05-17 10:34:13 +02:00
39ce21f7f9 Copy /lib/systemd/system/docker.service to /etc/systemd/system/docker.service
This allows later upgrading of docker without overwriting the changes
indicated in the README.
2017-05-17 10:12:22 +02:00
3308018887 Docker: replaced "latest-py36" with "latest" in README.md 2017-05-17 10:11:49 +02:00
b93448f682 Start cron when starting the Cloud docker
This will regularly run logrotate, preventing the build-up of log files
of multiple gigabytes.
2017-05-17 10:08:27 +02:00
2892a46a27 Docker: store Cloud container /var/log on host in /data/log 2017-05-17 10:07:40 +02:00
e2efc70e44 Import new subscription info function 2017-05-04 18:17:37 +02:00
bd9265e4f1 Tag blender_cloud Docker image as latest 2017-04-11 12:52:44 +02:00