Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aef9521190
							
						
					 | 
					
						
						
							
							Add support for reading a file's content or downloading it
						
						
						
						
						
					 | 
					
						2019-04-06 17:32:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							314a5ad546
							
						
					 | 
					
						
						
							
							Add FS logic for determining folder size as well as safe path resolution
						
						
						
						
						
					 | 
					
						2019-04-06 16:53:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							94223bafec
							
						
					 | 
					
						
						
							
							Fix docker user and write configuration to disk when setting user
						
						
						
						
						
					 | 
					
						2019-04-06 16:03:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6e2a442846
							
						
					 | 
					
						
						
							
							Ensure that permissions are set properly on daemon boot
						
						
						
						
						
					 | 
					
						2019-04-06 15:39:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							23df075253
							
						
					 | 
					
						
						
							
							Add support for checking/creating the Pterodactyl system user
						
						
						
						
						
					 | 
					
						2019-04-06 15:24:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d534b23606
							
						
					 | 
					
						
						
							
							Move configuration to own directory, modify docker environment setup to be easier to manage
						
						
						
						
						
					 | 
					
						2019-04-06 13:33:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fe30c2969d
							
						
					 | 
					
						
						
							
							Add the default environment variables for servers
						
						
						
						
						
					 | 
					
						2019-04-06 12:36:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7d67be8382
							
						
					 | 
					
						
						
							
							Add support for getting a server's log file via the API
						
						
						
						
						
					 | 
					
						2019-04-06 12:27:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b6bc9adf29
							
						
					 | 
					
						
						
							
							Implement very basic authorization for routes
						
						
						
						
						
					 | 
					
						2019-04-06 10:49:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a2df979e66
							
						
					 | 
					
						
						
							
							Ignore both EOF possibilities
						
						
						
						
						
					 | 
					
						2019-04-05 22:57:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7f50ff1f92
							
						
					 | 
					
						
						
							
							Add support for starting/stopping/killing a server via the API
						
						
						
						
						
					 | 
					
						2019-04-05 22:55:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							134debd529
							
						
					 | 
					
						
						
							
							Add basic API endpoints to get server data
						
						
						
						
						
					 | 
					
						2019-04-05 22:34:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cedbee5080
							
						
					 | 
					
						
						
							
							Add initial API support for listing configured servers
						
						
						
						
						
					 | 
					
						2019-04-05 22:20:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							ec2407481b
							
						
					 | 
					
						
						
							
							Fix pointer error
						
						
						
						
						
					 | 
					
						2019-04-05 22:20:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3b4555344c
							
						
					 | 
					
						
						
							
							Build out the docker environment a bit more
						
						
						
						
						
					 | 
					
						2019-04-05 21:59:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							447dafc76d
							
						
					 | 
					
						
						
							
							Update deprecated API call
						
						
						
						
						
					 | 
					
						2019-04-03 23:58:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4c6f2cf948
							
						
					 | 
					
						
						
							
							Whoops, casting strings like this is incorrect.
						
						
						
						
						
						
						
						For example, 25565 is a rune for 揝 when doing string(port). 
						
					 | 
					
						2019-04-03 23:54:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b69da4f43a
							
						
					 | 
					
						
						
							
							Correctly map to int not string here
						
						
						
						
						
					 | 
					
						2019-04-03 23:45:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e0f26e9693
							
						
					 | 
					
						
						
							
							Fix dependency hell because of old docker version
						
						
						
						
						
					 | 
					
						2019-04-03 23:34:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							25053cb2db
							
						
					 | 
					
						
						
							
							Remove initial iterations of code for now, will ref it later
						
						
						
						
						
					 | 
					
						2019-04-03 23:15:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b84ed20c24
							
						
					 | 
					
						
						
							
							Update docker environment to handle port mapping
						
						
						
						
						
					 | 
					
						2019-04-03 23:09:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c683809efc
							
						
					 | 
					
						
						
							
							Get more of the container creation fleshed out
						
						
						
						
						
					 | 
					
						2019-04-03 22:49:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3e4fcd527d
							
						
					 | 
					
						
						
							
							Pass through startup as argument
						
						
						
						
						
					 | 
					
						2019-04-03 22:20:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							08af485c40
							
						
					 | 
					
						
						
							
							Get basic environment creation beginning to work
						
						
						
						
						
					 | 
					
						2019-04-03 22:01:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							639d9edef5
							
						
					 | 
					
						
						
							
							Better configuration loading process for servers
						
						
						
						
						
						
						
						Loads up to 10 configurations at once in parallel 
						
					 | 
					
						2019-03-24 18:39:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							29de97c857
							
						
					 | 
					
						
						
							
							That editorconfig file really butchered the formatting for go
						
						
						
						
						
					 | 
					
						2019-03-24 18:00:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4bdf373ab8
							
						
					 | 
					
						
						
							
							Cleanup to better match the revised server data format
						
						
						
						
						
					 | 
					
						2019-03-24 17:39:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a3d5bf7982
							
						
					 | 
					
						
						
							
							Migrate very basic environment capabilities
						
						
						
						
						
					 | 
					
						2019-03-24 17:27:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							80b4da9284
							
						
					 | 
					
						
						
							
							Move configuration into root space
						
						
						
						
						
					 | 
					
						2019-03-24 15:59:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							75de4a412a
							
						
					 | 
					
						
						
							
							Add zap logger, migrate some constants up a level
						
						
						
						
						
					 | 
					
						2019-03-24 14:37:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							79818f5c65
							
						
					 | 
					
						
						
							
							Unused
						
						
						
						
						
					 | 
					
						2019-03-24 14:19:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d634c5dc38
							
						
					 | 
					
						
						
							
							Migrate to modules to remove the need for a gopath
						
						
						
						
						
					 | 
					
						2019-03-24 14:06:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1fbb03caf
							
						
					 | 
					
						
						
							
							remove api/routes.go
						
						
						
						
						
					 | 
					
						2018-05-17 21:24:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4ef7bef4fb
							
						
					 | 
					
						
						
							
							Merge pull request #5 from pterodactyl/feature/docker-environment
						
						
						
						
						
						
						
						Feature/docker environment 
						
					 | 
					
						2018-05-17 21:22:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							53a3fbc464
							
						
					 | 
					
						
						
							
							remove trailing slashes from api
						
						
						
						
						
						
						
						use correct handler to provide server logs
remove Baerer from Authorization header to compare it with known tokens
fix wings-api.paw routes 
						
					 | 
					
						2018-05-17 21:18:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							09da18f42e
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into feature/docker-environment
						
						
						
						
						
						
						
						# Conflicts:
#	.dev/vagrant/provision.sh
#	Gopkg.lock
#	Gopkg.toml
#	Vagrantfile
#	api/api.go
#	api/auth.go
#	api/handlers.go
#	api/handlers_server.go
#	api/routes.go
#	api/utils.go
#	command/root.go
#	control/docker_environment.go
#	control/server.go
#	glide.lock
#	glide.yaml
#	utils/logger.go
#	wings.go 
						
					 | 
					
						2018-05-16 10:00:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ce617c9a4
							
						
					 | 
					
						
						
							
							spell persistence correctly
						
						
						
						
						
					 | 
					
						2018-04-01 23:52:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							27b397c712
							
						
					 | 
					
						
						
							
							fix environment_docker_test data path
						
						
						
						
						
					 | 
					
						2018-04-01 23:41:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bba1c0d90
							
						
					 | 
					
						
						
							
							readd docker environment tests
						
						
						
						
						
						
						
						implement Exec() 
						
					 | 
					
						2018-03-14 13:59:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b43e3a43d
							
						
					 | 
					
						
						
							
							rename docker_environment to environment_docker
						
						
						
						
						
					 | 
					
						2018-03-14 10:35:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b182e9fa6
							
						
					 | 
					
						
						
							
							add ctop to vagrant provision for fancy monitoring of containers
						
						
						
						
						
					 | 
					
						2018-03-14 10:34:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							53704fb0d7
							
						
					 | 
					
						
						
							
							refactor websockets implementation
						
						
						
						
						
					 | 
					
						2018-03-14 10:34:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8b0702f84
							
						
					 | 
					
						
						
							
							switch to moby/moby in the docker_environment
						
						
						
						
						
					 | 
					
						2018-03-14 10:33:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2aa896a1c
							
						
					 | 
					
						
						
							
							use go dep with travis
						
						
						
						
						
					 | 
					
						2018-02-20 23:43:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							5836c320ff
							
						
					 | 
					
						
						
							
							fixes for vagrant and new go dep lockfile
						
						
						
						
						
					 | 
					
						2018-02-20 23:38:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							501409827e
							
						
					 | 
					
						
						
							
							some reorganisation etc. in control package
						
						
						
						
						
						
						
						some minor stuff
just pushing so I can try to replace fsouza/go-dockerclient with moby/moby/client 
						
					 | 
					
						2018-02-20 23:38:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							184d7e0afe
							
						
					 | 
					
						
						
							
							lots of api changes
						
						
						
						
						
						
						
						use jsonapi to format responses
add somewhat working websockets 
						
					 | 
					
						2018-02-20 23:36:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dane Everitt
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bbc6d26b35
							
						
					 | 
					
						
						
							
							Break more of everything
						
						
						
						
						
					 | 
					
						2018-02-20 15:20:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							31f4b465c1
							
						
					 | 
					
						
						
							
							replace glide with go dep
						
						
						
						
						
					 | 
					
						2018-02-20 21:36:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jakob Schrettenbrunner
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4e060a82f
							
						
					 | 
					
						
						
							
							rename to new lowercase github namespace
						
						
						
						
						
					 | 
					
						2018-02-20 21:25:31 +01:00 | 
					
					
						
						
							
							
							
						
					 |