Prepare for Connectbox interface #28
Conversation
- Expose directories of usb drive as auto-indexed json (ready for connectbox) - Add optional sample content role in the format expected by connectbox
Create placeholder index while we import the connectbox interface
…opriate than alias
| - name: update permissions on biblebox config files | ||
| file: | ||
| dest: "{{ biblebox_config_root }}" | ||
| - name: Create placeholder index file |
There was a problem hiding this comment.
We'll eventually need something here to copy the client interface to biblebox_default_content_root, correct?
There was a problem hiding this comment.
That's correct. You can remove the task that creates the placeholder index file, and replace it with a task like we have for copying/synchronising the admin ui. PM on slack if you're unfamiliar with ansible - happy to talk you through it.
|
Thanks, and yes, the client interface should go under html. |
| # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 | ||
| # Admin interface | ||
| location /admin/ { | ||
| root {{ biblebox_web_root }}; |
There was a problem hiding this comment.
Should this be biblebox_admin_root?
There was a problem hiding this comment.
Only if we had alias {{ biblebox_admin_root }}; instead. Given /admin is a common suffix, I'm told it's more idiomatic to use a root element, even though they're functionally identical.
There was a problem hiding this comment.
I mean, shouldn't it be
root {{ biblebox_admin_root }};
instead of
root {{ biblebox_web_root }};
biblebox_admin_root is where the files are being synchronized to in main.yml
There was a problem hiding this comment.
When you use root, the path on disk is the value of the root directive and the URL. The url starts with /admin/ in this case, so if we used {{ biblebox_admin_root }}, nginx would be looking for files under /var/www/biblebox/admin/admin. The alias directive doesn't append the URL when nginx is looking for files on disk so alias {{ biblebox_admin_root }} is equivalent to what we have. Perhaps you're thinking of alias?
There was a problem hiding this comment.
No, I'm just not real familiar with nginx configs. :-)
I didn't realize that root appended the url. This makes perfect sense now.
| @@ -46,27 +55,14 @@ nginx_vhosts: | |||
| auth_basic_user_file /usr/local/biblebox/etc/basicauth; | |||
| } | |||
|
|
|||
| location /shared/ { | |||
There was a problem hiding this comment.
The way I am understanding this, it looks like the fallback to web root content is no longer happening with this change. The intention of that was to allow the device to be shipped with some on device content not on the usb stick that would be merged with whatever is already on the device.
There was a problem hiding this comment.
I thought the intent of the biblebox itself was that all content could be quickly removed and hidden/destroyed? I'm a little late to the party so I'm sure I missed some discussion.
There was a problem hiding this comment.
The fallback to web root content has been taken away, but I took it out without realising the intent :-\ I think it's nice to have that feature, so let's merge this (so @furnox can continue) and I'll put it back in a followup PR.
There was a problem hiding this comment.
I'm not sure about the desire to quickly remove/hide content. I haven't heard about that use-case, but it'd be good to ask
|
I've created #29 to track the work to re-instate the ability to display non-USB content alongside USB content. |
@furnox is going to integrate the client side connect box interface (that was developed at the Boise hack). This prepares for that by: