mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	Clarify httpd/tasks/install.yml & web_support/tasks/main.yml
This commit is contained in:
		
							parent
							
								
									494dad9f12
								
							
						
					
					
						commit
						5f8745a794
					
				
					 2 changed files with 13 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -139,6 +139,7 @@
 | 
			
		|||
    group: "{{ apache_user }}"
 | 
			
		||||
    mode: '0755'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
- name: Install Apache's 010-iiab.conf & proxy_ajp.conf into /etc/apache2/sites-available, from templates
 | 
			
		||||
  template:
 | 
			
		||||
    src: "{{ item.src }}"
 | 
			
		||||
| 
						 | 
				
			
			@ -147,11 +148,6 @@
 | 
			
		|||
    - { src: 'roles/httpd/templates/010-iiab.conf.j2', dest: '/etc/{{ apache_conf_dir }}/010-iiab.conf' }
 | 
			
		||||
    - { src: 'roles/httpd/templates/proxy_ajp.conf.j2', dest: '/etc/{{ apache_conf_dir }}/proxy_ajp.conf' }
 | 
			
		||||
 | 
			
		||||
- name: Install /etc/{{ apache_conf_dir }}/iiab-homepage.conf from template, for http://box redirect to http://box/home/
 | 
			
		||||
  template:
 | 
			
		||||
    src: iiab-homepage.conf
 | 
			
		||||
    dest: "/etc/{{ apache_conf_dir }}/iiab-homepage.conf"
 | 
			
		||||
 | 
			
		||||
- name: "IN CASE NGINX IS DISABLED: Enable IIAB pages via Apache (e.g. on port 80) by running 'a2ensite 010-iiab.conf'"
 | 
			
		||||
  command: a2ensite 010-iiab.conf
 | 
			
		||||
  #when: apache_enabled | bool
 | 
			
		||||
| 
						 | 
				
			
			@ -161,13 +157,18 @@
 | 
			
		|||
#   when: not apache_enabled
 | 
			
		||||
 | 
			
		||||
# MOVED FROM roles/homepage/tasks/main.yml (as NGINX-only IIAB's won't need it)
 | 
			
		||||
# and 'mkdir /library/www/html/home' is now done by roles/web_support for Admin
 | 
			
		||||
# Console which hard-codes that as a requirement, as of 2020-02-12.
 | 
			
		||||
# and 'mkdir /library/www/html/home' is now done by web_support/tasks/main.yml
 | 
			
		||||
# for Admin Console which hard-codes that as a requirement, as of 2020-02-12.
 | 
			
		||||
#
 | 
			
		||||
# './runrole --reinstall apache' is a decent solution today, for folks needing
 | 
			
		||||
# changes, but to make sure such things work in the field/offline/etc: soft-
 | 
			
		||||
# coding of iiab_home_url should probably be taken more seriously thruout IIAB!
 | 
			
		||||
#
 | 
			
		||||
- name: Install /etc/{{ apache_conf_dir }}/iiab-homepage.conf from template, for http://box redirect to http://box/home/
 | 
			
		||||
  template:
 | 
			
		||||
    src: iiab-homepage.conf
 | 
			
		||||
    dest: "/etc/{{ apache_conf_dir }}/iiab-homepage.conf"
 | 
			
		||||
 | 
			
		||||
- name: "IN CASE NGINX IS DISABLED: Enable iiab-homepage.conf via Apache (e.g. on port 80) by running 'a2ensite iiab-homepage.conf'"
 | 
			
		||||
  command: a2ensite iiab-homepage.conf
 | 
			
		||||
  #when: apache_enabled | bool
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,6 +24,11 @@
 | 
			
		|||
 | 
			
		||||
# 2020-02-12: *REQUIRED* by iiab-admin-console/roles/js-menu/tasks/main.yml,
 | 
			
		||||
# which should probably instead softcode iiab_home_url as set in local_vars.yml
 | 
			
		||||
#
 | 
			
		||||
# SEE httpd/tasks/install.yml for related 'a2ensite iiab-homepage.conf'
 | 
			
		||||
#
 | 
			
		||||
# (Both mkdir & iiab-homepage.conf stuff used to be in homepage/tasks/main.yml)
 | 
			
		||||
#
 | 
			
		||||
- name: Create dir {{ doc_root }}/home
 | 
			
		||||
  file:
 | 
			
		||||
    state: directory
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue