mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	Ubuntu 18.04 is going to ship Calibre 3.20, use debs
This commit is contained in:
		
							parent
							
								
									fd2daca9c0
								
							
						
					
					
						commit
						01dee58596
					
				
					 4 changed files with 9 additions and 4 deletions
				
			
		|  | @ -1,6 +1,6 @@ | |||
| - name: Start by installing OS's Calibre package | ||||
|   package: | ||||
|     name: calibre | ||||
|     name: calibre calibre-bin | ||||
|     state: present | ||||
| 
 | ||||
| # April 5 2018 raspbian is now tracking the latest Calibre with a small delay. | ||||
|  | @ -13,7 +13,7 @@ | |||
| 
 | ||||
| - name: Upgrade to tesing Calibre - non-RPi | ||||
|   command: scripts/calibre-install-latest.sh | ||||
|   when: not is_rpi | ||||
|   when: not is_rpi and not is_ubuntu_18 | ||||
| 
 | ||||
| - name: Upgrade to unstable Calibre -  all | ||||
|   command: scripts/calibre-install-unstable.sh | ||||
|  |  | |||
|  | @ -3,13 +3,16 @@ | |||
| # RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST | ||||
| - name: Install Calibre via calibre-installer.py (redhat, ubuntu, debian if NOT calibre_debs_on_debian) | ||||
|   include_tasks: py-installer.yml | ||||
|   when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian) | ||||
|   when: is_redhat or (is_ubuntu and not is_ubuntu_18) or (is_debian and not calibre_debs_on_debian) | ||||
|   #when: not is_rpi | ||||
| 
 | ||||
| - name: Install Calibre via .debs (Raspbian, Debian if calibre_debs_on_debian) | ||||
|   include_tasks: debs.yml | ||||
|   when: is_rpi or (is_debian and calibre_debs_on_debian) | ||||
|   #when: is_rpi or is_debian     # (is_debian also covers & includes is_rpi) | ||||
| 
 | ||||
| - name: Install Calibre via .debs (Ubuntu 18.xx) | ||||
|   include_tasks: debs.yml | ||||
|   when: is_ubuntu_18 | ||||
| 
 | ||||
| - name: Create calibre-serve.service and calibre.conf | ||||
|   template: | ||||
|  |  | |||
|  | @ -383,6 +383,7 @@ xovis_chart_heading: "My School: Usage Data Visualization" | |||
| # wide to narrow | ||||
| is_debuntu: False | ||||
| is_ubuntu: False | ||||
| is_ubuntu_18: False | ||||
| is_debian: False | ||||
| is_debian_9: False | ||||
| is_debian_8: False | ||||
|  |  | |||
|  | @ -1,5 +1,6 @@ | |||
| is_debuntu: True | ||||
| is_ubuntu: True | ||||
| is_ubuntu_18: True | ||||
| dns_service: bind9 | ||||
| dns_user: bind | ||||
| dhcp_service: isc-dhcp-server | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue