From: Bill Erickson Date: Thu, 13 Apr 2017 02:58:55 +0000 (-0400) Subject: move optional packages to extras dir X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d44c43aef34b658d893a911589ea87c35d5c36dc;p=working%2Frandom.git move optional packages to extras dir Signed-off-by: Bill Erickson --- diff --git a/README.adoc b/README.adoc index c915a2442..46f6af2b1 100644 --- a/README.adoc +++ b/README.adoc @@ -1,14 +1,27 @@ = Evergreen / OpenSRF Ansible Installer -== settings.yml - -Review the values contained in setting.yml and modify as needed. - -== Running +== Quick How-To [source,sh] --------------------------------------------------------------------------- sudo ansible-playbook playbook.yml -e "hosts=127.0.0.1" --------------------------------------------------------------------------- +== File Structure + +=== playbook.yml + +Main playbook. Run this. + +=== settings.yml + +Installation settings. This should be the only file that needs changing. + +=== */main.yml + +Entry point for each collection of sub-tasks. + +=== extras + +Optional packages not strictly required for OpenSRF and Evergreen. diff --git a/evergreen/main.yml b/evergreen/main.yml index 2043448f6..0d8f1f2bd 100644 --- a/evergreen/main.yml +++ b/evergreen/main.yml @@ -4,14 +4,8 @@ include: eg-web.yml - name: Install Evergreen include: eg-install.yml -- name: Setup Rsyslog - include: rsyslog.yml - when: use_rsyslog - name: Setup Apache include: apache.yml -- name: Install Nginx - include: nginx.yml - when: use_nginx - name: Install Database include: database.yml when: install_database diff --git a/evergreen/nginx.yml b/evergreen/nginx.yml deleted file mode 100644 index 01c01bf23..000000000 --- a/evergreen/nginx.yml +++ /dev/null @@ -1,50 +0,0 @@ -# Apache must be reconfigured before NGINX is installed -# or the NGINX install will fail on conflicting ports -- replace: - dest: /etc/apache2/ports.conf - regexp: 'Listen 80' - replace: 'Listen 7080' -- replace: - dest: /etc/apache2/ports.conf - regexp: 'Listen 443' - replace: 'Listen 7443' -- replace: - dest: /etc/apache2/sites-available/eg.conf - regexp: ':80' - replace: ':7080' -- replace: - dest: /etc/apache2/sites-available/eg.conf - regexp: ':443' - replace: ':7443' -- name: Restart Apache With New Ports - service: name=apache2 state=restarted -- name: Install Nginx Prereqs - apt: name=nginx state=present -- name: Install NGINX Configs - copy: - src: "{{repo_base}}/OpenSRF/examples/nginx/osrf-ws-http-proxy" - dest: /etc/nginx/sites-available/osrf-ws-http-proxy -- name: Link NGINX Configs - file: - state: link - src: /etc/nginx/sites-available/osrf-ws-http-proxy - dest: /etc/nginx/sites-enabled/osrf-ws-http-proxy -- name: Remove Default NGINX Site - file: - state: absent - dest: /etc/nginx/sites-available/default -- name: Restart NGINX With New Config - service: name=nginx state=restarted -- name: Update OpenSRF WS JS Port - lineinfile: - dest: /openils/lib/javascript/opensrf_ws.js - regexp: '^var WEBSOCKET_PORT_SSL = 7682;' - line: 'var WEBSOCKET_PORT_SSL = 443;' -- name: Update OpenSRF WS JS Port (Shared) - # This file is not currently used, but may be later. - lineinfile: - dest: /openils/lib/javascript/opensrf_ws_shared.js - regexp: '^var WEBSOCKET_PORT_SSL = 7682;' - line: 'var WEBSOCKET_PORT_SSL = 443;' - - diff --git a/evergreen/rsyslog.yml b/evergreen/rsyslog.yml deleted file mode 100644 index 1cef2be9b..000000000 --- a/evergreen/rsyslog.yml +++ /dev/null @@ -1,21 +0,0 @@ -- name: Configure Rsyslog - when: use_rsyslog - copy: - src: "{{repo_base}}/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf" - dest: /etc/rsyslog.d/evergreen.conf -- name: Restart Rsyslog - when: use_rsyslog - service: name=rsyslog state=restarted -- name: Update opensrf_core.xml for rsyslog - replace: - dest: "{{eg_install_path}}/conf/opensrf_core.xml" - regexp: '\/(.*)\n.*' -- replace: - dest: "{{eg_install_path}}/conf/opensrf_core.xml" - regexp: '-->.*\n(.*)' - replace: '' -- replace: - dest: "{{eg_install_path}}/conf/opensrf_core.xml" - regexp: '-->.*\n(.*)' - replace: '' diff --git a/extras/main.yml b/extras/main.yml new file mode 100644 index 000000000..37899edc3 --- /dev/null +++ b/extras/main.yml @@ -0,0 +1,6 @@ +- name: Setup Rsyslog + include: rsyslog.yml + when: use_rsyslog +- name: Install Nginx + include: nginx.yml + when: use_nginx diff --git a/extras/nginx.yml b/extras/nginx.yml new file mode 100644 index 000000000..01c01bf23 --- /dev/null +++ b/extras/nginx.yml @@ -0,0 +1,50 @@ +# Apache must be reconfigured before NGINX is installed +# or the NGINX install will fail on conflicting ports +- replace: + dest: /etc/apache2/ports.conf + regexp: 'Listen 80' + replace: 'Listen 7080' +- replace: + dest: /etc/apache2/ports.conf + regexp: 'Listen 443' + replace: 'Listen 7443' +- replace: + dest: /etc/apache2/sites-available/eg.conf + regexp: ':80' + replace: ':7080' +- replace: + dest: /etc/apache2/sites-available/eg.conf + regexp: ':443' + replace: ':7443' +- name: Restart Apache With New Ports + service: name=apache2 state=restarted +- name: Install Nginx Prereqs + apt: name=nginx state=present +- name: Install NGINX Configs + copy: + src: "{{repo_base}}/OpenSRF/examples/nginx/osrf-ws-http-proxy" + dest: /etc/nginx/sites-available/osrf-ws-http-proxy +- name: Link NGINX Configs + file: + state: link + src: /etc/nginx/sites-available/osrf-ws-http-proxy + dest: /etc/nginx/sites-enabled/osrf-ws-http-proxy +- name: Remove Default NGINX Site + file: + state: absent + dest: /etc/nginx/sites-available/default +- name: Restart NGINX With New Config + service: name=nginx state=restarted +- name: Update OpenSRF WS JS Port + lineinfile: + dest: /openils/lib/javascript/opensrf_ws.js + regexp: '^var WEBSOCKET_PORT_SSL = 7682;' + line: 'var WEBSOCKET_PORT_SSL = 443;' +- name: Update OpenSRF WS JS Port (Shared) + # This file is not currently used, but may be later. + lineinfile: + dest: /openils/lib/javascript/opensrf_ws_shared.js + regexp: '^var WEBSOCKET_PORT_SSL = 7682;' + line: 'var WEBSOCKET_PORT_SSL = 443;' + + diff --git a/extras/rsyslog.yml b/extras/rsyslog.yml new file mode 100644 index 000000000..1cef2be9b --- /dev/null +++ b/extras/rsyslog.yml @@ -0,0 +1,21 @@ +- name: Configure Rsyslog + when: use_rsyslog + copy: + src: "{{repo_base}}/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf" + dest: /etc/rsyslog.d/evergreen.conf +- name: Restart Rsyslog + when: use_rsyslog + service: name=rsyslog state=restarted +- name: Update opensrf_core.xml for rsyslog + replace: + dest: "{{eg_install_path}}/conf/opensrf_core.xml" + regexp: '\/(.*)\n.*' +- replace: + dest: "{{eg_install_path}}/conf/opensrf_core.xml" + regexp: '-->.*\n(.*)' + replace: '' +- replace: + dest: "{{eg_install_path}}/conf/opensrf_core.xml" + regexp: '-->.*\n(.*)' + replace: '' diff --git a/playbook.yml b/playbook.yml index 1fd7692ea..0469bdb28 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,4 +1,5 @@ -## +# OpenSRF / Evergreen Ansible Installer Playbook +# Author: Bill Erickson - hosts: '{{hosts}}' connection: local @@ -12,3 +13,5 @@ include: opensrf/main.yml - name: Process Evergreen Tasks include: evergreen/main.yml + - name: Process Optional Packages + include: extras/main.yml