| *** tpb has joined #timvideos | 00:00 | |
| *** jck has joined #timvideos | 00:23 | |
| cfelton | CarlFK: not sure I understand? Are you saying #openhatch has general git advise? | 00:36 |
|---|---|---|
| shenki | mithro: you should ask digilent to release the atlys design | 01:27 |
| mithro | cfelton: you still around? I can walk you through git stuff | 01:35 |
| *** Niharika|mobile has joined #timvideos | 02:10 | |
| *** Niharika has joined #timvideos | 02:23 | |
| mithro | MaZderMind: i assume you are asleep | 02:29 |
| mithro | MaZderMind: ping me when you are around | 02:29 |
| mithro | aps: ping? | 02:30 |
| *** Joelw has quit IRC | 02:32 | |
| *** Joelw has joined #timvideos | 02:32 | |
| mithro | shenki: ping? | 02:36 |
| mithro | cfelton: #openhatch is a community dedicated to helping people contribute to open source | 02:36 |
| mithro | aps: it looks like the "best" way to run ansible is via "Ansible Tower" which isn't open source or free? :( | 02:37 |
| aps | mithro: Tower is just a UI/dashboard | 02:42 |
| mithro | aps: I'm just about to set up that vpn server you requested | 02:46 |
| mithro | aps: is there a preferred VPN system which will punch through the restrictions you have? | 02:46 |
| aps | mithro: Thanks. It should preferably work through port 22. Other ports are probably closed. And nice to have good bandwidth :) | 02:48 |
| mithro | aps: so, we can do openvpn, httptunnel, ssh.... | 02:48 |
| mithro | openvpn is probably easier / more secure - but more likely to be blocked | 02:48 |
| mithro | http(s)tunnel will get through pretty much anything but is more of a pain | 02:49 |
| aps | mithro: openvpn free hosts are available many a times but it gets blocked pretty soon | 02:49 |
| shenki | mithro: pong | 02:52 |
| mithro | shenki: I assume you didn't end up committing and pushing what you've got done so far? :P | 02:52 |
| shenki | mithro: nah, i didn't even sit down and look at it yet | 02:52 |
| mithro | shenki: If you can just do a temp commit / push then I can peek at your stuff and see if there is anything worth starting from :) | 02:53 |
| mithro | aps: would you be vpning from windows or Linux? | 02:54 |
| aps | mithro: I generally keep switching, but I need it mainly from Linux | 02:55 |
| shenki | mithro: okay. which bits are you thinking about? | 02:58 |
| mithro | shenki: anything you have :) | 02:58 |
| shenki | mithro: i think everything i wrote is on github | 02:58 |
| shenki | i tend to push wip stuff to branches | 02:58 |
| mithro | shenki: oh okay, I thought you said you had uncommitted / unpushed stuff | 02:58 |
| shenki | mithro: hrm. if i said that it might be true | 02:59 |
| mithro | shenki: and why ya creating irons :P | 03:00 |
| shenki | mithro: hrm? | 03:00 |
| shenki | mithro: ah. i vaguely remember that. that's the name we gave to the rackspace machine i think? | 03:02 |
| shenki | mithro: you did that with me iirc | 03:02 |
| mithro | shenki: any idea what it was for? | 03:03 |
| shenki | mithro: i think we were going to do the fpga stuff on there? | 03:03 |
| shenki | mithro: as far as im concerned you can remove it | 03:03 |
| shenki | mithro: i haven't told you that there's a machine called rosa on underwood | 03:03 |
| shenki | mithro: it's a v6 only guest that ive been using to build stuff | 03:03 |
| mithro | shenki: what is that for? | 03:03 |
| shenki | mithro: running ubuntu latest | 03:04 |
| shenki | if you want me to move it i can | 03:04 |
| shenki | i just wanted a well connected machine | 03:04 |
| mithro | shenki: nah, its fine | 03:05 |
| mithro | aps: so where does "saltstack" fit in the whole ansible / puppet / chef area? | 03:17 |
| aps | mithro: saltstack is s similar alternative to ansible | 03:17 |
| mithro | aps: how do you think it compares in popularity? | 03:17 |
| mithro | aps: salt is python right? | 03:18 |
| aps | mithro: yes, python | 03:18 |
| aps | both ansible and salt are new | 03:18 |
| aps | mithro: http://www.scriptrock.com/articles/ansible-vs-salt | 03:19 |
| tpb | Title: Ansible vs. Salt (at www.scriptrock.com) | 03:19 |
| aps | mithro: btw if you can provide an ssh tunnel (reverse tunnel, I guess?), that'd be best on my network | 03:22 |
| mithro | aps: your preference is still chef right? | 03:22 |
| aps | mithro: no, ansible :) | 03:22 |
| mithro | aps: ansible's reliance on ssh access seems a bit bad | 03:23 |
| aps | mithro: but we need to open specific ports for chef clients to communicate with master as well | 03:24 |
| mithro | aps: the design of all these tools suck :P | 03:24 |
| aps | mithro: Actually, go through this as well if you have time. http://www.scriptrock.com/articles/ansible-vs-chef | 03:24 |
| tpb | Title: Ansible vs Chef (at www.scriptrock.com) | 03:24 |
| mithro | aps: that review is super bad, anyone who thinks that ansible "just sshing into the machines" is a good design is clearly not a devop | 03:27 |
| aps | oh | 03:28 |
| mithro | aps: it's really tempting design, because that's how you do things the old way right? a sys admin sshes into a machine and then types some commands | 03:29 |
| mithro | aps: but one of the primary points of a cfg management system is that it should be *robust* | 03:30 |
| mithro | aps: and running commands via ssh is not robust in terms of flaky networks, bad configurations, etc | 03:30 |
| aps | mithro: True. Various people have very different opinions. I see one person shifting from puppet to ansible and absolutely hates chef, another person who believes chef fixed the problems in puppet | 03:32 |
| mithro | aps: so far I'm liking salt from reading at the high level | 03:38 |
| aps | okay | 03:38 |
| mithro | aps: but if everyone else is using ansible, then we are still better using that | 03:38 |
| mithro | aps: https://missingm.co/2013/06/ansible-and-salt-a-detailed-comparison/ this review seems more reasoned | 03:42 |
| tpb | Title: MissingM - Ansible and Salt: A detailed comparison (at missingm.co) | 03:42 |
| aps | mithro: yeah, I was going through this | 03:42 |
| mithro | aps: what I'm still a little confused about is how salt/ansible check "compliance" | 03:44 |
| aps | mithro: http://www.ansible.com/blog/ansible-and-using-automation-to-assert-it-compliance | 03:46 |
| tpb | Title: Ansible and using Automation to Assert IT Compliance (at www.ansible.com) | 03:46 |
| mithro | setting up a machine from scratch is the easy part, really its just a shell script | 03:46 |
| aps | mithro: It's still not clear from this post :/ | 03:46 |
| mithro | aps: another main point is that I should be able to add a new user to the configuration and all the *existing* servers get the new user | 03:49 |
| aps | that happens in ansible | 03:50 |
| mithro | aps: I like how they claim "Not only can agents not be disabled" but a simple "iptables -I INPUT --dport 22 -j DROP" will disable ansible's ability to do anything to a server | 03:53 |
| mithro | ansible's web UI being closed source also annoys me :P | 03:54 |
| aps | mithro: wow, that's just the opposite of what I feel | 03:54 |
| aps | Why can't the agents be disabled? | 03:54 |
| mithro | aps: ansible doesn't have agents, it sshs into machines | 03:55 |
| mithro | aps: plus when the config management system has gone mad, disabling the agent is really useful :) | 03:55 |
| aps | yeah, I'm aware of that. I think I didn't get the context of your statement :) | 03:55 |
| *** CarlFK has joined #timvideos | 04:05 | |
| *** ChanServ sets mode: +v CarlFK | 04:05 | |
| mithro | aps: so... I was thinking of going one of these config management tools a go to setup this vpn server | 04:07 |
| aps | mithro: okay, which tool have you decided upon? :P | 04:18 |
| mithro | no idea :P | 04:19 |
| *** Niharika|mobile has quit IRC | 04:22 | |
| aps | mithro: initial hard-coded ideas-selector demo - http://aps-sids.github.io/asknot/ | 04:40 |
| tpb | Title: What can I do for the world? (at aps-sids.github.io) | 04:40 |
| mithro | aps: cool! | 04:41 |
| aps | Like a great man always says, "Patches welcome!" :P | 04:41 |
| mithro | aps: got a repo? | 04:48 |
| aps | mithro: http://github.com/aps-sids/asknot/ branch gh-pages shows up on the above link | 04:49 |
| tpb | Title: aps-sids/asknot · GitHub (at github.com) | 04:49 |
| cfelton | mithro: ping | 05:15 |
| mithro | cfelton: pong | 05:15 |
| cfelton | still willing to walk me through the git stuff? | 05:16 |
| cfelton | hold on, a little one has awoken - be back in 5 | 05:16 |
| mithro | cfelton: okay | 05:17 |
| cfelton | back | 05:19 |
| *** travis-ci has joined #timvideos | 05:19 | |
| travis-ci | mithro/HDMI2USB#72 (master - c67f834 : Tim Ansell): The build is still failing. | 05:19 |
| travis-ci | Change view : https://github.com/mithro/HDMI2USB/compare/57085783e1f6...c67f83496347 | 05:19 |
| travis-ci | Build details : http://travis-ci.org/mithro/HDMI2USB/builds/47191758 | 05:19 |
| *** travis-ci has left #timvideos | 05:19 | |
| mithro | cfelton: okay | 05:22 |
| mithro | cfelton: do you understand what a "branch" is? | 05:22 |
| cfelton | recap, I have a bunch of changes on "master" that I want to move to a branch and create a new branch to do small changes (I think) | 05:22 |
| mithro | cfelton: yeah | 05:23 |
| cfelton | best I can tell, I have the hash where I need to go back to | 05:23 |
| mithro | cfelton: so a couple of concepts - every commit in git is referenced by a sha1 hash | 05:25 |
| mithro | cfelton: a branch is just a set of commits | 05:25 |
| mithro | cfelton: you can use either git checkout or git branch commands to create new branches | 05:25 |
| mithro | cfelton: checkout is how you switch your current working directory between branches | 05:26 |
| cfelton | mithro: ok | 05:27 |
| cfelton | mithro: checkout move between branches and commits? | 05:27 |
| cfelton | i.e. backup in time | 05:27 |
| mithro | cfelton: you can checkout to a commit directory, but generally you checkout to a branch | 05:27 |
| mithro | cfelton: first thing you probably want to do, is push any changes you have locally to github | 05:29 |
| mithro | cfelton: that way you have a backup copy somewhere if things go really wrong :) | 05:30 |
| cfelton | good to go, git status indicates no local changes | 05:30 |
| mithro | cfelton: github is showing that your last commit was from the 14th November? | 05:31 |
| mithro | sorry, 3rd November | 05:31 |
| cfelton | that is probably correct, I think I have a bunch of new files | 05:31 |
| cfelton | might take a while to figure out all the files to add | 05:32 |
| cfelton | yes, I did a bunch in Oct/Nov but not much since | 05:32 |
| mithro | can you pastebin the output of "git status" ? | 05:32 |
| cfelton | https://gist.github.com/cfelton/9a0b318cf38288c0a1cc | 05:35 |
| tpb | Title: git_status_19Feb2015.txt (at gist.github.com) | 05:35 |
| mithro | cfelton: so, you probably want to commit those untracked files, even if only temporarily | 05:36 |
| cfelton | all of them? what is the quickest way? git add * ? | 05:36 |
| cfelton | ok, pushed | 05:39 |
| mithro | so whats git status show now? | 05:41 |
| cfelton | # On branch master | 05:44 |
| cfelton | mothing to commit, working directory clean | 05:44 |
| mithro | great! | 05:46 |
| mithro | are you on linux? | 05:46 |
| cfelton | yes | 05:47 |
| *** 7JTACBT4Q has quit IRC | 05:48 | |
| mithro | okay, so I recommend installing gitk | 05:49 |
| *** scrollback3 has joined #timvideos | 05:50 | |
| mithro | gitk gives you a nice visual interface which will make this easier to understand what is going on | 05:51 |
| cfelton | installing | 05:51 |
| cfelton | ok | 05:51 |
| mithro | cfelton: if you start up gitk in your git directory with a "gitk --all" you should get a picture like this -> | 05:53 |
| mithro | http://scie.nti.st/images/gitk.jpg | 05:53 |
| cfelton | more or less, yup | 05:54 |
| mithro | okay | 05:54 |
| mithro | each line is a commit | 05:54 |
| mithro | and the green things are branches | 05:55 |
| mithro | cfelton: so the first thing we are going to do is create a new branch at the original point you started making changes at | 05:55 |
| cfelton | ok, have it highlighted | 05:56 |
| mithro | Is it this one -> https://github.com/cfelton/HDMI2USB/commit/f6a4b247904e88fb43a1a6c22d4b7b2d80a85e23 ? | 05:57 |
| tpb | Title: Merge pull request #94 from shenki/cfelton-fixes · f6a4b24 · cfelton/HDMI2USB · GitHub (at github.com) | 05:57 |
| cfelton | yup | 05:57 |
| mithro | great! | 05:57 |
| mithro | so rightclick on the commit and select the "create branch" option | 05:57 |
| cfelton | the branch I am creating is the small changes branch or where all the master stuff will go? | 05:58 |
| mithro | where your small changes will go | 05:59 |
| cfelton | ok, created | 05:59 |
| mithro | okay, now right click on the new green label and select "checkout" which will switch you to using that branch | 05:59 |
| cfelton | ok | 06:00 |
| mithro | so, now you'll want to "cherry-pick" you changes onto this branch | 06:01 |
| mithro | you can do that by right clicking on the commit | 06:02 |
| cfelton | I dont' think I want anything from the master, I watned/needed a clean to make some small changes | 06:02 |
| mithro | and then selecting cherry-pick | 06:02 |
| mithro | cfelton: oh, okay | 06:02 |
| mithro | then you probably want to do the following | 06:02 |
| mithro | close gitk | 06:02 |
| cfelton | but I think I want to move all the master stuff to a branch? | 06:02 |
| mithro | cfelton: master is just another branch name, it's not really special in any way | 06:03 |
| cfelton | ok | 06:03 |
| mithro | cfelton: the upstream repo as moved forward | 06:03 |
| mithro | cfelton: so you probably want to base your changes off the latest changes | 06:04 |
| mithro | so first, add upstream as a remote with a "git remote add upstream https://github.com/timvideos/HDMI2USB.git; git fetch upstream" | 06:04 |
| cfelton | jinx | 06:04 |
| cfelton | ok | 06:04 |
| cfelton | done | 06:05 |
| *** Niharika has quit IRC | 06:06 | |
| mithro | if you start up gitk with "gitk --all" you should see now an upstream/master branch in the UI | 06:06 |
| cfelton | i think so | 06:07 |
| cfelton | it is ... | 06:07 |
| mithro | okay, you should create a new branch there | 06:08 |
| cfelton | where? | 06:08 |
| mithro | at the upstream/master position | 06:08 |
| mithro | check it out | 06:08 |
| cfelton | remotes/upstream/master | 06:08 |
| mithro | then delete that other branch you created | 06:08 |
| cfelton | ok | 06:08 |
| mithro | cfelton: yeah | 06:09 |
| cfelton | ok | 06:09 |
| cfelton | if I don't push my changes before more *upstream* changes occur, do I need to repeat the above (add remote, fetch, checkout)? | 06:10 |
| mithro | the remote is permanently added | 06:11 |
| mithro | if new changes get added upstream you'll have to fetch | 06:11 |
| mithro | and then either do a merge or rebase | 06:11 |
| cfelton | ok | 06:11 |
| cfelton | THANKS! | 06:11 |
| cfelton | I should be good for now | 06:11 |
| mithro | you'll want to push your vranch to github with "git push origin <branchname>" | 06:12 |
| mithro | bblr | 06:40 |
| *** techdragon has quit IRC | 07:16 | |
| *** techdragon has joined #timvideos | 07:18 | |
| *** slomo has joined #timvideos | 08:12 | |
| *** abhinav95 has joined #timvideos | 09:29 | |
| *** scrollback3 has quit IRC | 10:07 | |
| *** f15h has joined #timvideos | 10:16 | |
| MaZderMind | mithro: ping | 10:43 |
| *** hyades_ has joined #timvideos | 11:02 | |
| *** aps has quit IRC | 11:04 | |
| *** hyades has quit IRC | 11:04 | |
| *** hyades_ is now known as hyades | 11:04 | |
| MaZderMind | am ansible is not just 'running command via ssh' but transferring control logic including parts to rollback incomplete changes via sftp to the machine and then invokes them there. ssh just happens to be the widest deployed communication channel for servers | 11:06 |
| *** aps has joined #timvideos | 11:07 | |
| *** hyades_ has joined #timvideos | 11:09 | |
| *** f15h has quit IRC | 11:12 | |
| *** abhinav95 has quit IRC | 12:02 | |
| *** sirnam has joined #timvideos | 12:18 | |
| *** f15h has joined #timvideos | 12:26 | |
| *** f15h has quit IRC | 13:11 | |
| *** abhinav95 has joined #timvideos | 14:08 | |
| *** CARAM__ has quit IRC | 14:12 | |
| *** Niharika has joined #timvideos | 14:14 | |
| *** CARAM__ has joined #timvideos | 14:28 | |
| *** sirnam has quit IRC | 15:40 | |
| *** hyades has quit IRC | 16:00 | |
| *** CARAM__ has quit IRC | 16:00 | |
| *** abhinav95 has quit IRC | 16:12 | |
| *** hyades has joined #timvideos | 16:21 | |
| *** CARAM__ has joined #timvideos | 16:30 | |
| *** scrollback3 has joined #timvideos | 16:50 | |
| *** fumblehool has joined #timvideos | 16:51 | |
| *** Nooob has joined #timvideos | 17:21 | |
| *** wanig has quit IRC | 18:02 | |
| *** hyades has quit IRC | 18:30 | |
| *** Nooob has quit IRC | 18:49 | |
| *** MaZderMind has quit IRC | 18:55 | |
| *** fumblehool has quit IRC | 18:58 | |
| *** f15h has joined #timvideos | 19:01 | |
| *** f15h has quit IRC | 19:04 | |
| *** Niharika has quit IRC | 19:22 | |
| *** Nooob has joined #timvideos | 19:32 | |
| *** Nooob has quit IRC | 19:53 | |
| *** f15h has joined #timvideos | 20:21 | |
| *** MaZderMind has joined #timvideos | 20:34 | |
| *** sirnam has joined #timvideos | 20:35 | |
| *** sirnam has quit IRC | 22:05 | |
| *** sirnam has joined #timvideos | 22:39 | |
| *** sirnam has quit IRC | 22:55 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!
