- is_wsl variable fixed
- names with spaces revised
This commit is contained in:
		
							parent
							
								
									3f1fe7ef5c
								
							
						
					
					
						commit
						716c4e3b8d
					
				
							
								
								
									
										2
									
								
								lenverge.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										2
									
								
								lenverge.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Find the script's own directory to run from the correct location,
 | 
					# Find the script's own directory to run from the correct location,
 | 
				
			||||||
# ensuring that playbook.yml and other files are found.
 | 
					# ensuring that playbook.yml and other files are found.
 | 
				
			||||||
chmod +x /home/$(whoami)
 | 
					chmod +x "/home/$(whoami)"
 | 
				
			||||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 | 
					SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 | 
				
			||||||
cd "$SCRIPT_DIR"
 | 
					cd "$SCRIPT_DIR"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -24,7 +24,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
- name: "Set is_wsl fact based on /proc/version content"
 | 
					- name: "Set is_wsl fact based on /proc/version content"
 | 
				
			||||||
  ansible.builtin.set_fact:
 | 
					  ansible.builtin.set_fact:
 | 
				
			||||||
    is_wsl: "'Microsoft' in (lookup('file', '/proc/version') | default(''))"
 | 
					    is_wsl: "{{ 'Microsoft' in (lookup('file', '/proc/version') | default('')) }}"
 | 
				
			||||||
  when: proc_version_stat.stat.exists
 | 
					  when: proc_version_stat.stat.exists
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: "Ensure correct automount options are set in /etc/wsl.conf"
 | 
					- name: "Ensure correct automount options are set in /etc/wsl.conf"
 | 
				
			||||||
@ -40,7 +40,7 @@
 | 
				
			|||||||
      enabled = true
 | 
					      enabled = true
 | 
				
			||||||
      options = "metadata,uid={{ ansible_user_uid }},gid={{ ansible_user_gid }},umask=22,fmask=11"
 | 
					      options = "metadata,uid={{ ansible_user_uid }},gid={{ ansible_user_gid }},umask=22,fmask=11"
 | 
				
			||||||
      [user]
 | 
					      [user]
 | 
				
			||||||
      default = {{ ansible_env.SUDO_USER | default(ansible_user_id) }}
 | 
					      default = "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}"
 | 
				
			||||||
  register: wsl_conf_result
 | 
					  register: wsl_conf_result
 | 
				
			||||||
  when: is_wsl | default(false)
 | 
					  when: is_wsl | default(false)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@ server {
 | 
				
			|||||||
    listen 80;
 | 
					    listen 80;
 | 
				
			||||||
    server_name {{ project.domain }};
 | 
					    server_name {{ project.domain }};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    root {{ project.document_root }};
 | 
					    root "{{ project.document_root }}";
 | 
				
			||||||
    index index.php;
 | 
					    index index.php;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    access_log /var/log/nginx/{{ project.domain }}-access.log;
 | 
					    access_log /var/log/nginx/{{ project.domain }}-access.log;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user