mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
commit
a5ac22404a
8 changed files with 27 additions and 40 deletions
|
@ -14,7 +14,7 @@
|
||||||
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
|
# 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!
|
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
||||||
|
|
||||||
calibreweb_version: 0.6.4 # WAS: master
|
calibreweb_version: master # WAS: master, 0.6.4
|
||||||
|
|
||||||
calibreweb_venv_path: /usr/local/calibre-web
|
calibreweb_venv_path: /usr/local/calibre-web
|
||||||
calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
|
calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
||||||
|
|
||||||
# Info needed to install Lokole
|
# Info needed to install Lokole
|
||||||
lokole_version: 0.5.2
|
lokole_version: 0.5.3
|
||||||
lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!)
|
lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!)
|
||||||
lokole_admin_password: changeme
|
lokole_admin_password: changeme
|
||||||
lokole_install_path: "{{ content_base }}/lokole" # /library/lokole
|
lokole_install_path: "{{ content_base }}/lokole" # /library/lokole
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
|
# 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!
|
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
||||||
|
|
||||||
mediawiki_major_version: "1.33"
|
mediawiki_major_version: "1.34"
|
||||||
mediawiki_minor_version: "1"
|
mediawiki_minor_version: "0"
|
||||||
mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}"
|
mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}"
|
||||||
|
|
||||||
mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}"
|
mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}"
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
# Supplied by IIAB sourced by /etc/dnsmasq.d/iiab.conf
|
# Supplied by IIAB sourced by /etc/dnsmasq.d/iiab.conf
|
||||||
{{ iiab_hostname }} {{ lan_ip }}
|
{{ lan_ip }} box {{ iiab_hostname }}
|
||||||
box {{ lan_ip }}
|
|
||||||
|
|
|
@ -5,28 +5,23 @@
|
||||||
with_items:
|
with_items:
|
||||||
- { src: "server.conf",dest: "/etc/nginx/" }
|
- { src: "server.conf",dest: "/etc/nginx/" }
|
||||||
- { src: "nginx.conf",dest: "/etc/nginx/" }
|
- { src: "nginx.conf",dest: "/etc/nginx/" }
|
||||||
- { src: "usb-lib.conf",dest: "/etc/nginx/conf.d/" }
|
- { src: "ports.conf" , dest: "/etc/{{ apache_service }}/" }
|
||||||
- { src: "modules.conf",dest: "/etc/nginx/conf.d/" }
|
- { src: "iiab.conf.j2",dest: "/etc/nginx/conf.d/iiab.conf" }
|
||||||
# - { src: "admin-console.ini",dest: "/etc/uwsgi/apps-enabled/" }
|
|
||||||
# the above should be enough once uwsgi is started
|
|
||||||
# - { src: "uwsgi.unit",dest: "/etc/systemd/system/uwsgi.socket" }
|
|
||||||
- { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' }
|
|
||||||
when: nginx_enabled
|
when: nginx_enabled
|
||||||
|
|
||||||
|
- name: Clean stale config files
|
||||||
|
file:
|
||||||
|
state: absent
|
||||||
|
path: '{{ item.path }}'
|
||||||
|
with_items:
|
||||||
|
- { path: "/etc/nginx/conf.d/usb-lib.conf" }
|
||||||
|
- { path: "/etc/nginx/conf.d/modules.conf" }
|
||||||
|
|
||||||
- name: Insure that apache2 is not running -- we may need port swap
|
- name: Insure that apache2 is not running -- we may need port swap
|
||||||
systemd:
|
systemd:
|
||||||
name: apache2
|
name: apache2
|
||||||
state: stopped
|
state: stopped
|
||||||
|
|
||||||
# optional services
|
|
||||||
- name: Install config for Admin Console
|
|
||||||
template:
|
|
||||||
src: admin-console-nginx.conf
|
|
||||||
# Comment one or the other to revert from nginx back to apache2, if required
|
|
||||||
# src: admin-console-apache.conf
|
|
||||||
dest: /etc/nginx/conf.d/admin-console.conf
|
|
||||||
when: admin_console_enabled and nginx_enabled
|
|
||||||
|
|
||||||
# the below slides in nginx's proxypass config files for apache on localhost
|
# the below slides in nginx's proxypass config files for apache on localhost
|
||||||
# via the ports.conf file installed above
|
# via the ports.conf file installed above
|
||||||
- name: Install proxpass to apache running on localhost port {{ apache_port }}
|
- name: Install proxpass to apache running on localhost port {{ apache_port }}
|
||||||
|
@ -73,10 +68,3 @@
|
||||||
state: restarted
|
state: restarted
|
||||||
enabled: true
|
enabled: true
|
||||||
when: nginx_enabled
|
when: nginx_enabled
|
||||||
|
|
||||||
#- name: Enable the uwsgi systemd service
|
|
||||||
# systemd:
|
|
||||||
# name: uwsgi
|
|
||||||
# state: restarted
|
|
||||||
# enabled: true
|
|
||||||
# when: admin_console_enabled and nginx_enabled
|
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
|
location / {
|
||||||
|
rewrite ^/$ $1/{{ iiab_home_url }};
|
||||||
|
}
|
||||||
|
|
||||||
|
location /usb {
|
||||||
|
alias /library/www/html/local_content/;
|
||||||
|
autoindex on;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /local_content/ {
|
||||||
|
autoindex on;
|
||||||
|
}
|
||||||
|
|
||||||
location /modules/ {
|
location /modules/ {
|
||||||
fancyindex on; # Enable fancy indexes.
|
fancyindex on; # Enable fancy indexes.
|
||||||
fancyindex_exact_size off; # Output human-readable file sizes.
|
fancyindex_exact_size off; # Output human-readable file sizes.
|
||||||
fancyindex_ignore index.htmlf rachel-index.php;
|
fancyindex_ignore index.htmlf rachel-index.php;
|
||||||
# autoindex on;
|
|
||||||
# autoindex_exact_size off;
|
|
||||||
# autoindex_format html;
|
|
||||||
# autoindex_localtime on;
|
|
||||||
}
|
}
|
|
@ -8,7 +8,6 @@ server {
|
||||||
access_log {{ apache_log_dir }}/scripts.log scripts;
|
access_log {{ apache_log_dir }}/scripts.log scripts;
|
||||||
|
|
||||||
index index.php index.html index.htm;
|
index index.php index.html index.htm;
|
||||||
rewrite ^/$ $scheme://$server_addr/home/;
|
|
||||||
|
|
||||||
# let individual services drop location blocks in conf.d
|
# let individual services drop location blocks in conf.d
|
||||||
include /etc/nginx/conf.d/*;
|
include /etc/nginx/conf.d/*;
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
location /usb {
|
|
||||||
alias /library/www/html/local_content/;
|
|
||||||
autoindex on;
|
|
||||||
}
|
|
||||||
location /local_content/ {
|
|
||||||
autoindex on;
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue