mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	Merge pull request #1267 from holta/ansible-warnings
Clean URL in nextcloud/tasks/main.yml; clarify httpd/tasks/main.yml & 4-server-options/tasks/main.yml
This commit is contained in:
		
						commit
						ba4476f821
					
				
					 3 changed files with 6 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -23,6 +23,9 @@
 | 
			
		|||
  when: squid_install
 | 
			
		||||
  tags: base, squid, network, domain
 | 
			
		||||
 | 
			
		||||
# NETWORK moved to the very end, after Stage 9 (9-LOCAL-ADDONS)
 | 
			
		||||
# It can also be run manually using: cd /opt/iiab/iiab; ./iiab-network
 | 
			
		||||
#
 | 
			
		||||
#- name: NETWORK
 | 
			
		||||
#  include_role:
 | 
			
		||||
#    name: network
 | 
			
		||||
| 
						 | 
				
			
			@ -72,7 +75,7 @@
 | 
			
		|||
    src: roles/1-prep/templates/iiab_env.py.j2
 | 
			
		||||
    dest: /etc/iiab/iiab_env.py
 | 
			
		||||
 | 
			
		||||
- name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation (script was installed at the beginning of Stage 3 = roles/3-base-server/tasks/main.yml, which runs the HTTPD playbook = roles/httpd/tasks/main.yml)
 | 
			
		||||
- name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation.  (This script was installed at the beginning of Stage 3 = roles/3-base-server/tasks/main.yml, which ran Apache playbook = roles/httpd/tasks/main.yml)
 | 
			
		||||
  command: /usr/bin/iiab-refresh-wiki-docs
 | 
			
		||||
  when: not nodocs
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -215,7 +215,7 @@
 | 
			
		|||
  tags:
 | 
			
		||||
    - base
 | 
			
		||||
 | 
			
		||||
- name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation (will be run at the end of Stage 4 = roles/4-server-options/tasks/main.yml)
 | 
			
		||||
- name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation.  (This script will run at the end of Stage 4 = roles/4-server-options/tasks/main.yml)
 | 
			
		||||
  template:
 | 
			
		||||
    src: refresh-wiki-docs.sh
 | 
			
		||||
    dest: /usr/bin/iiab-refresh-wiki-docs
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,7 @@ nextcloud_force_install: False
 | 
			
		|||
nextcloud_url: /nextcloud
 | 
			
		||||
nextcloud_prefix: /opt
 | 
			
		||||
nextcloud_data_dir: "{{ content_base }}/nextcloud/data"
 | 
			
		||||
nextcloud_dl_url: https://download.nextcloud.com/server/releases/
 | 
			
		||||
nextcloud_dl_url: https://download.nextcloud.com/server/releases
 | 
			
		||||
nextcloud_orig_src_file: latest-14.tar.bz2
 | 
			
		||||
nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue