| 
						
					 | 
					
						
						
							
						
						dbff6e23ed
					 | 
					
						
						
							
							simplify postgres connection parameters as a single string
						
						
						
						
						
						
					 | 
					
						2021-02-16 16:08:54 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7d4b485a5
					 | 
					
						
						
							
							missed a spot
						
						
						
						
						
						
					 | 
					
						2021-02-15 23:52:52 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9389c80cb6
					 | 
					
						
						
							
							fixing error messages and naming functions better
						
						
						
						
						
						
					 | 
					
						2021-02-15 23:51:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0de5305eac
					 | 
					
						
						
							
							explain error from vms with no ip yet
						
						
						
						
						
						
					 | 
					
						2021-02-15 21:17:10 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e55798494b
					 | 
					
						
						
							
							pig snorting sounds
						
						
						
						
						
						
					 | 
					
						2021-02-15 21:10:57 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f75575313b
					 | 
					
						
						
							
							fix merge missing "fix index out of range when parsing output from
						
						
						
						
						
						
						
						shell_scripts/get.sh" 
						
						
					 | 
					
						2021-02-15 21:08:44 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2bc5b10284
					 | 
					
						
						
							
							add INTERNAL_HTTP_TIMEOUT_SECONDS option 5min default
						
						
						
						
						
						
					 | 
					
						2021-02-15 21:00:34 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf281b12e1
					 | 
					
						
						
							
							copy and paste error
						
						
						
						
						
						
					 | 
					
						2021-02-15 20:35:49 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab4c94e37c
					 | 
					
						
						
							
							correctly test for none result in double_check_capsul_address
						
						
						
						
						
						
					 | 
					
						2021-02-15 20:32:24 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af272a6b70
					 | 
					
						
						
							
							Revert "temporarily thow exception from check capsul addr"
						
						
						
						
						
						
						
						This reverts commit 1fd3ccb8a3. 
						
						
					 | 
					
						2021-02-15 20:27:17 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						05d5b15c4a
					 | 
					
						
						
							
							oops I was thinking golang dont assign append it returns None
						
						
						
						
						
						
					 | 
					
						2021-02-15 20:20:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1fd3ccb8a3
					 | 
					
						
						
							
							temporarily thow exception from check capsul addr
						
						
						
						
						
						
					 | 
					
						2021-02-15 20:13:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47b2b3ee13
					 | 
					
						
						
							
							introduce InterThreadResult to ensure that current_app is only accessed
						
						
						
						
						
						
						
						from the main flask thread 
						
						
					 | 
					
						2021-02-15 20:06:35 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a70c974ec
					 | 
					
						
						
							
							ssh_public_keys -> ssh_authorized_keys rename (merge fix)
						
						
						
						
						
						
					 | 
					
						2021-02-15 19:44:26 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d0088ef13
					 | 
					
						
						
							
							fix version #s
						
						
						
						
						
						
					 | 
					
						2021-02-15 19:24:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						534855c764
					 | 
					
						
						
							
							correctly merge db migrations with origin master (coreos)
						
						
						
						
						
						
					 | 
					
						2021-02-15 19:19:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c9a492ae3
					 | 
					
						
						
							
							remove wishful thinking type anotation
						
						
						
						
						
						
					 | 
					
						2021-02-15 18:35:44 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cc164dce01
					 | 
					
						
						
							
							manually merging in the sshkeys to the spoke model/hub model interface
						
						
						
						
						
						
					 | 
					
						2021-02-15 18:16:15 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						44ee42764c
					 | 
					
						
						
							
							delete unused virt model
						
						
						
						
						
						
					 | 
					
						2021-02-15 18:05:17 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1129a8355
					 | 
					
						
						
							
							manually merging the spoke model / virt model changes
						
						
						
						
						
						
					 | 
					
						2021-02-15 18:05:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c6d7eb380
					 | 
					
						
						
							
							eclipse failed to add deleted files
						
						
						
						
						
						
					 | 
					
						2021-02-15 17:52:31 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dad6547825
					 | 
					
						
						
							
							Merge branch 'master' into multiple-hosts
						
						
						
						
						
						
						
						Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py 
						
						
					 | 
					
						2021-02-15 17:52:17 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b3f3603cc
					 | 
					
						
						
							
							CoreOS isnt ready
						
						
						
						
						
						
					 | 
					
						2021-02-01 12:27:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3639a295c4
					 | 
					
						
						
							
							Add coreos
						
						
						
						
						
						
					 | 
					
						2021-02-01 10:59:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						645ddede02
					 | 
					
						
						
							
							fix a bug where accumulating stale login tokens can lock out an account
						
						
						
						
						
						
					 | 
					
						2021-01-31 18:02:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cbe658b7ae
					 | 
					
						
						
							
							clarify cloud based use case for hypothetical non-tofu ssh
						
						
						
						
						
						
					 | 
					
						2021-01-31 02:31:27 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						51721ffdc0
					 | 
					
						
						
							
							wording
						
						
						
						
						
						
					 | 
					
						2021-01-31 02:20:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7568699920
					 | 
					
						
						
							
							clearly specify that its about the default ssh config
						
						
						
						
						
						
					 | 
					
						2021-01-31 02:16:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9222daefbc
					 | 
					
						
						
							
							fix wording
						
						
						
						
						
						
					 | 
					
						2021-01-31 02:13:55 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a853eeef69
					 | 
					
						
						
							
							replace nonsensical namecoin plug with "Why ssh more ssh"
						
						
						
						
						
						
					 | 
					
						2021-01-31 02:09:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d878a07350
					 | 
					
						
						
							
							Will anyone actually attack you like that? Who knows. Personally, I'd
						
						
						
						
						
						
						
						rather not find out. 
						
						
					 | 
					
						2021-01-31 01:31:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cee23f1799
					 | 
					
						
						
							
							apostrophe
						
						
						
						
						
						
					 | 
					
						2021-01-31 01:24:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						658f8bf316
					 | 
					
						
						
							
							more fix wording
						
						
						
						
						
						
					 | 
					
						2021-01-31 01:22:23 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a785392b00
					 | 
					
						
						
							
							blah
						
						
						
						
						
						
					 | 
					
						2021-01-31 01:19:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57666cf2ab
					 | 
					
						
						
							
							more grammar & writing edits
						
						
						
						
						
						
					 | 
					
						2021-01-31 01:18:15 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a904114c3
					 | 
					
						
						
							
							mor grammer fixs
						
						
						
						
						
						
					 | 
					
						2021-01-31 00:57:33 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebaf348dd3
					 | 
					
						
						
							
							fix grammer
						
						
						
						
						
						
					 | 
					
						2021-01-31 00:25:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4f39ca018
					 | 
					
						
						
							
							fix whitespace
						
						
						
						
						
						
					 | 
					
						2021-01-31 00:21:25 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bef26c38cf
					 | 
					
						
						
							
							dont put lists inside <p> tags
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:41:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01a31be091
					 | 
					
						
						
							
							signed, forest
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:30:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9bf277842
					 | 
					
						
						
							
							more wikipedia links
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:25:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f56135c599
					 | 
					
						
						
							
							more wikipedia links!
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:24:12 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						113e6e9339
					 | 
					
						
						
							
							link to https://en.wikipedia.org/wiki/Man-in-the-middle_attack
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:22:32 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d85ebd9042
					 | 
					
						
						
							
							"on the network  between A and B "
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:20:26 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf9bcd1912
					 | 
					
						
						
							
							duplicate links to /about-ssh
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:17:09 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b5583a0ed
					 | 
					
						
						
							
							make link to about-ssh be a paragraph
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:15:34 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7217ff7a6d
					 | 
					
						
						
							
							add /about-ssh essay
						
						
						
						
						
						
					 | 
					
						2021-01-30 22:14:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c849ec3c11
					 | 
					
						
						
							
							add 25 cent buffer to affordable_vm_sizes logic for UX
						
						
						
						
						
						
					 | 
					
						2021-01-30 15:27:24 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						280bcfd584
					 | 
					
						
						
							
							check null on double_check_capsul_address 😬
						
						
						
						
						
						
					 | 
					
						2021-01-30 02:10:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39980d836b
					 | 
					
						
						
							
							remove debug log
						
						
						
						
						
						
					 | 
					
						2021-01-30 02:05:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |