1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-10-10 09:58:55 +00:00
Commit Graph

4118 Commits

Author SHA1 Message Date
Jeremy Grossmann
b3e86be182 Merge pull request #37 from planctechnologies/server_security2
Add secure communication between gui and server 2/2
2014-09-30 11:24:28 -06:00
Jeremy Grossmann
5802c2b9f5 Merge pull request #36 from planctechnologies/server_security
Add secure communication between gui and server 1/2
2014-09-30 11:23:04 -06:00
Jeremy Grossmann
83cef60c0f Merge pull request #35 from planctechnologies/deadman2
Deadman switch support 2/2
2014-09-30 11:20:39 -06:00
Jeremy Grossmann
e39c93c91a Merge pull request #34 from planctechnologies/deadman
Deadman switch support 1/2
2014-09-30 11:20:01 -06:00
grossmj
1a96a150bc Fix shemas for QEMU. 2014-09-30 11:15:15 -06:00
Michael
65fdafda40 Merge pull request #6 from planctechnologies/gns-108
Add a --quiet mode to gns3server
2014-09-29 19:55:36 -06:00
Jerry Seutter
c66fbbdb36 Merge improved ssl and auth support 2014-09-29 18:24:28 -06:00
Jerry Seutter
03fb75437b Add cert and auth support to gns3server. 2014-09-29 18:19:35 -06:00
Jerry Seutter
3833803244 Copy deadman switch code from old repository into gns3server. 2014-09-29 18:14:07 -06:00
Jerry Seutter
7c446796fe gns3server now controls the deadman switch. 2014-09-29 18:09:16 -06:00
Jerry Seutter
ee88d6f808 Merge branch 'master' into dev 2014-09-29 17:24:52 -06:00
Jerry Seutter
d4d774055a Remove unused parameter 2014-09-29 16:01:39 -06:00
Jerry Seutter
efc80ff17a Revert version number change 2014-09-29 15:59:49 -06:00
Jerry Seutter
91fba4aca4 Use logging config to set destination of copyright info 2014-09-29 15:56:01 -06:00
grossmj
46495b9265 Merge remote-tracking branch 'origin/master' 2014-09-28 18:23:51 -06:00
grossmj
a8193fa063 Split the PATH environment variable using os.pathsep 2014-09-28 18:23:27 -06:00
Jeremy Grossmann
e3eecb6584 Merge pull request #33 from dlintott/fix_broken_test
Fix test for dynamips c7200 NPE (Default is now NPE-400)
2014-09-27 15:07:20 -06:00
Jeremy Grossmann
35f3434b2f Merge pull request #32 from noplay/osx_installation
Instruction for development on MacOS X
2014-09-27 13:56:28 -06:00
Daniel Lintott
20dc779fd8 Fix test for dynamips c7200 NPE (Default is now NPE-400) 2014-09-27 19:27:26 +01:00
Julien Duponchelle
04f670cb50 Instruction for development on MacOS X 2014-09-27 19:59:58 +02:00
Jerry Seutter
23686215fe Add a --quiet mode to gns3server 2014-09-25 14:42:37 -06:00
grossmj
6dce005594 Bump to version 1.0-beta1.dev1. 2014-09-24 11:14:28 -06:00
grossmj
a49f107af2 Bump to version 1.0-beta3. 2014-09-24 11:01:33 -06:00
grossmj
e7141685cc Tweaks to support Qemu on Windows. 2014-09-23 21:38:51 -06:00
grossmj
aca9e0de56 Qemu integration stage 2, support for ASA and IDS. 2014-09-22 21:24:55 -06:00
Jerry Seutter
3b465890b6 Increase sleep to work around Rackspace slowness 2014-09-22 09:10:30 -06:00
Jerry Seutter
cf59240bef Bugfixes with cloud server communication 2014-09-21 21:41:51 -06:00
grossmj
d1715baae1 Base QEMU support. 2014-09-18 15:47:43 -06:00
Jerry Seutter
b132c901c9 Disabling auth from version string 2014-09-18 20:39:12 +00:00
Michael
a0e2fe551a Added web user and password to start_server output 2014-09-15 21:25:09 -06:00
jseutter
800d4d91f9 Merge pull request #5 from planctechnologies/gns3-87-bugfixes
Gns-87 bugfixes
2014-09-11 14:48:26 -06:00
Michael
6c6c9200e4 Add CN support to cert as command line arg 2014-09-08 22:07:33 -06:00
Michael
4fa87005bc Enabled HTTP Auth, SSL and DMS disabling based on cloud.conf availability 2014-09-08 21:51:56 -06:00
Michael
17e4b51d18 Testing out dummy config 2014-09-08 20:45:36 -06:00
Jerry Seutter
6421367259 Importing changeset from gns3dms repo 2014-09-08 15:35:22 +00:00
jseutter
6ff2c654d9 Merge pull request #4 from planctechnologies/gns3-87
Gns3 87 - add server security and startup scripts
2014-09-08 09:25:28 -06:00
Michael
f876a862c4 GNS3 server will now create the heardbeat file durining initialization 2014-09-06 21:13:09 -06:00
Michael
ef492d4690 Update gns3dms to support cloud.conf 2014-09-06 20:46:06 -06:00
Michael
36e539382c Added support for cloud.conf file and startup script 2014-09-06 00:51:43 -06:00
Michael
6f9e0f6d2e Moved certs to .config 2014-09-03 22:19:59 -06:00
Michael
b84dda3c8e HTTP auth added to file_upload and jsonrpc 2014-09-03 22:12:34 -06:00
Jerry Seutter
e2f3d2aca8 Pull from dev 2014-09-03 20:39:02 +00:00
Michael
382e693fc8 Added authentication handler for basic auth check 2014-09-03 00:05:06 -06:00
Michael
a95cc678e9 Added server.py ssl mode dependant on cert existence 2014-09-02 22:33:45 -06:00
Michael
bcf0aae531 Added HOME support and cert dir to create_cert script 2014-09-02 22:17:06 -06:00
grossmj
b483f87c2f Bump version to 1.0-beta3.dev1. 2014-09-02 15:49:39 -06:00
grossmj
9d2e18328b Bump version to 1.0-beta2. 2014-09-02 13:06:26 -06:00
Michael
174013da80 Merge pull request #2 from planctechnologies/deadman
GNS-42 - Move deadman switch into gns3server codebase
2014-08-31 23:50:41 -06:00
Michael
99a8f5f21a Added create_cert.sh and ssl_options to enable SSL 2014-08-30 01:32:48 -06:00
Jerry Seutter
5e72fcbe14 GNS-42 - Move deadman switch into gns3server codebase 2014-08-29 18:05:56 +00:00