mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
A Holt
GitHub
commit
e36d48e7b4
9 changed files with 92 additions and 76 deletions
|
|
@ -47,7 +47,7 @@ To learn more about our open community architecture for "offline" education, sta
|
|||
|
||||
Pre-releases of Internet-in-a-Box (IIAB) undergo continuous QA / continuous integration / continuous deployment and are **strongly recommended!**
|
||||
|
||||
Install our latest pre-release using the 1-line installer at: [download.iiab.io](http://download.iiab.io/)
|
||||
Install our latest pre-release using the 1-line installer at: [**download.iiab.io**](http://download.iiab.io/)
|
||||
|
||||
You can also consider <!--latest Internet-in-a-Box (IIAB)--> earlier official releases at: [github.com/iiab/iiab/releases](https://github.com/iiab/iiab/releases)
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
when: not jupyterhub_enabled
|
||||
|
||||
|
||||
- name: 'Install from template: {{ nginx_conf_dir }}/jupyterhub-nginx.conf'
|
||||
- name: "Install from template: {{ nginx_conf_dir }}/jupyterhub-nginx.conf"
|
||||
template:
|
||||
src: jupyterhub-nginx.conf
|
||||
dest: "{{ nginx_conf_dir }}/"
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
- name: Make the directories to hold JupyterHub config
|
||||
file:
|
||||
state: directory
|
||||
path: '{{ item }}'
|
||||
path: "{{ item }}"
|
||||
with_items:
|
||||
- '{{ jupyterhub_venv }}/etc/jupyter'
|
||||
- '{{ jupyterhub_venv }}/etc/jupyterhub'
|
||||
- '{{ jupyterhub_venv }}/etc/systemd'
|
||||
- "{{ jupyterhub_venv }}/etc/jupyter"
|
||||
- "{{ jupyterhub_venv }}/etc/jupyterhub"
|
||||
- "{{ jupyterhub_venv }}/etc/systemd"
|
||||
|
||||
- name: Use npm to install configurable-http-proxy
|
||||
npm:
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
global: yes
|
||||
state: latest
|
||||
|
||||
- name: 'Use pip to install into a virtual environment: {{ jupyterhub_venv }}'
|
||||
- name: "Use pip to install into a virtual environment: {{ jupyterhub_venv }} (~229 MB)"
|
||||
pip:
|
||||
name:
|
||||
- pip
|
||||
|
|
@ -38,19 +38,19 @@
|
|||
- jupyterlab
|
||||
- jupyterhub_firstuseauthenticator
|
||||
- jupyterhub-systemdspawner
|
||||
virtualenv: "{{ jupyterhub_venv }}" # /opt/iiab/jupyter
|
||||
virtualenv: "{{ jupyterhub_venv }}" # /opt/iiab/jupyterhub
|
||||
virtualenv_site_packages: no
|
||||
virtualenv_command: /usr/bin/virtualenv
|
||||
virtualenv_python: python3
|
||||
extra_args: "--no-cache-dir"
|
||||
when: internet_available
|
||||
|
||||
- name: 'Install from template: {{ jupyterhub_venv }}/etc/jupyterhub/jupyterhub_config.py'
|
||||
- name: "Install from template: {{ jupyterhub_venv }}/etc/jupyterhub/jupyterhub_config.py"
|
||||
template:
|
||||
src: jupyterhub_config.py
|
||||
dest: '{{ jupyterhub_venv }}/etc/jupyterhub/'
|
||||
dest: "{{ jupyterhub_venv }}/etc/jupyterhub/"
|
||||
|
||||
- name: 'Install from template: /etc/systemd/system/jupyterhub.service'
|
||||
- name: "Install from template: /etc/systemd/system/jupyterhub.service"
|
||||
template:
|
||||
src: jupyterhub.service
|
||||
dest: /etc/systemd/system/
|
||||
|
|
|
|||
|
|
@ -4,13 +4,20 @@ location /jupyterhub {
|
|||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-NginX-Proxy true;
|
||||
}
|
||||
|
||||
# websocket headers
|
||||
# Managing WebHook/Socket requests between hub user servers and external proxy
|
||||
location ~* /(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/? {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
|
||||
# WebSocket support
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
#proxy_set_header Connection $connection_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_set_header X-Scheme $scheme;
|
||||
|
||||
proxy_buffering off;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Admin Console
|
||||
* captiveportal
|
||||
* IIAB documentation (http://box/info)
|
||||
* JupyterHub
|
||||
* jupyterhub
|
||||
* osm-vector-maps
|
||||
* OER2Go/RACHEL modules
|
||||
* usb_lib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# IIAB notes: sites-enabled is for server declarations
|
||||
# cond.d is for location declarations within the main server block
|
||||
# IIAB notes:
|
||||
# /etc/nginx/sites-enabled is for server declarations
|
||||
# /etc/nginx/conf.d is for location declarations within the main server block
|
||||
|
||||
user www-data;
|
||||
worker_processes auto;
|
||||
|
|
@ -7,82 +8,90 @@ pid /run/nginx.pid;
|
|||
include /etc/nginx/modules-enabled/*.conf;
|
||||
|
||||
events {
|
||||
worker_connections 768;
|
||||
# multi_accept on;
|
||||
worker_connections 768;
|
||||
# multi_accept on;
|
||||
}
|
||||
|
||||
http {
|
||||
|
||||
##
|
||||
# Basic Settings
|
||||
##
|
||||
##
|
||||
# Basic Settings
|
||||
##
|
||||
|
||||
sendfile on;
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 2048;
|
||||
sendfile on;
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 2048;
|
||||
|
||||
# server_tokens off;
|
||||
# server_tokens off;
|
||||
|
||||
server_names_hash_bucket_size 64;
|
||||
# server_name_in_redirect off;
|
||||
server_names_hash_bucket_size 64;
|
||||
# server_name_in_redirect off;
|
||||
|
||||
include /etc/nginx/mime.types;
|
||||
default_type text/html;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type text/html;
|
||||
|
||||
##
|
||||
# SSL Settings
|
||||
##
|
||||
##
|
||||
# SSL Settings
|
||||
##
|
||||
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
|
||||
ssl_prefer_server_ciphers on;
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
|
||||
ssl_prefer_server_ciphers on;
|
||||
|
||||
##
|
||||
# Logging Settings
|
||||
##
|
||||
##
|
||||
# Logging Settings
|
||||
##
|
||||
|
||||
log_format awstats
|
||||
'$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "http_x_forwarded_for"';
|
||||
log_format awstats
|
||||
'$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "http_x_forwarded_for"';
|
||||
|
||||
access_log {{ nginx_log_dir }}/access.log awstats;
|
||||
error_log {{ nginx_log_dir }}/error.log;
|
||||
access_log {{ nginx_log_dir }}/access.log awstats;
|
||||
error_log {{ nginx_log_dir }}/error.log;
|
||||
|
||||
log_format scripts '$request > $document_root$fastcgi_script_name $fastcgi_path_info';
|
||||
access_log {{ nginx_log_dir }}/scripts.log scripts;
|
||||
log_format scripts '$request > $document_root$fastcgi_script_name $fastcgi_path_info';
|
||||
access_log {{ nginx_log_dir }}/scripts.log scripts;
|
||||
|
||||
##
|
||||
# Gzip Settings
|
||||
##
|
||||
|
||||
##
|
||||
# Gzip Settings
|
||||
##
|
||||
gzip on;
|
||||
gzip_disable "msie6";
|
||||
|
||||
gzip on;
|
||||
gzip_disable "msie6";
|
||||
# gzip_vary on;
|
||||
# gzip_proxied any;
|
||||
# gzip_comp_level 6;
|
||||
# gzip_buffers 16 8k;
|
||||
# gzip_http_version 1.1;
|
||||
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
|
||||
# gzip_vary on;
|
||||
# gzip_proxied any;
|
||||
# gzip_comp_level 6;
|
||||
# gzip_buffers 16 8k;
|
||||
# gzip_http_version 1.1;
|
||||
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
##
|
||||
# Virtual Host Configs
|
||||
##
|
||||
# 2021-04-17: STANZA BELOW THANKS TO @georgejhunt FOR http://box/jupyterhub
|
||||
# SEE ALSO IIAB's: roles/jupyterhub/templates/jupyterhub-nginx.conf
|
||||
|
||||
# top-level http config for websocket headers
|
||||
# If Upgrade is defined, Connection = upgrade
|
||||
# If Upgrade is empty, Connection = close
|
||||
map $http_upgrade $connection_upgrade {
|
||||
default upgrade;
|
||||
'' close;
|
||||
}
|
||||
|
||||
# include a server file which in turn includes conf.d/*
|
||||
include /etc/nginx/server.conf;
|
||||
|
||||
# include other sites
|
||||
include /etc/nginx/sites-enabled/*.conf;
|
||||
##
|
||||
# Virtual Host Configs
|
||||
##
|
||||
|
||||
# include a server file which in turn includes conf.d/*
|
||||
include /etc/nginx/server.conf;
|
||||
|
||||
# define the upstream backend fastcgi for php
|
||||
upstream php {
|
||||
server unix:/run/php/php{{ php_version }}-fpm.sock;
|
||||
}
|
||||
# include other sites
|
||||
include /etc/nginx/sites-enabled/*.conf;
|
||||
|
||||
# define the upstream backend fastcgi for php
|
||||
upstream php {
|
||||
server unix:/run/php/php{{ php_version }}-fpm.sock;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# Node.js version used by roles/nodejs/tasks/main.yml for 3 roles:
|
||||
# nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer)
|
||||
|
||||
# nodejs_version: 12.x # was 8.x until 2019-02-02, was 10.x until 2019-12-21
|
||||
# nodejs_version: 14.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29
|
||||
|
||||
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
|
||||
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
# 2. DOWNLOAD+LINK /opt/iiab/sugarizer
|
||||
|
||||
- name: Clone llaske/sugarizer ({{ sugarizer_git_version }} branch/version) from GitHub to /opt/iiab/{{ sugarizer_dir_version }} (MAY DOWNLOAD 600+ MB)
|
||||
- name: Clone llaske/sugarizer ({{ sugarizer_git_version }} branch/version) from GitHub to /opt/iiab/{{ sugarizer_dir_version }} (DOWNLOADS ~710 MB)
|
||||
git:
|
||||
repo: https://github.com/llaske/sugarizer
|
||||
dest: "{{ iiab_base }}/{{ sugarizer_dir_version }}"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mysql_service: mariadb
|
|||
apache_log: /var/log/apache2/access.log
|
||||
sshd_package: openssh-server
|
||||
sshd_service: ssh
|
||||
php_version: 7.4 # 2020-11-14: Change to 8.0 very soon?
|
||||
php_version: 7.4 # 2020-04-22: Will Ubuntu 21.10 require 8.0?
|
||||
# "postgresql_version: 11.2" failed (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 19.04)
|
||||
postgresql_version: 12 # 2020-11-14: Change to 13 very soon?
|
||||
postgresql_version: 13 # 2020-04-22: Will Ubuntu 21.10 require 14?
|
||||
systemd_location: /lib/systemd/system
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue