*** greg-g has quit IRC | 00:06 | |
*** rohitj__ has quit IRC | 00:32 | |
*** pmiller has quit IRC | 01:07 | |
*** paulproteus has quit IRC | 02:03 | |
*** sama has joined #cc | 02:18 | |
*** Bernstein229 has joined #cc | 02:25 | |
Bernstein229 | hi | 02:25 |
---|---|---|
Bernstein229 | is anyone on? | 02:25 |
isforinsects | Sort of | 02:26 |
Bernstein229 | lol | 02:26 |
Bernstein229 | I have a question about how the licences work | 02:26 |
parkerhiggins | i'm here too. maybe i can help? | 02:27 |
Bernstein229 | ok | 02:27 |
Bernstein229 | well | 02:27 |
isforinsects | I = volunteer. And nothing I say should be constituted as legal advice, blah blah blah. | 02:27 |
isforinsects | Ask away | 02:27 |
Bernstein229 | if you want to use the licence | 02:27 |
Bernstein229 | on a website | 02:27 |
Bernstein229 | for music | 02:27 |
Bernstein229 | or anything | 02:27 |
parkerhiggins | oh yeah, ianal tinla | 02:27 |
Bernstein229 | do you just put the licence | 02:27 |
Bernstein229 | ont he website | 02:27 |
Bernstein229 | and it applies | 02:27 |
Bernstein229 | to everything? | 02:27 |
isforinsects | No, you can specify what exactly a license applies to. | 02:28 |
Bernstein229 | ok | 02:28 |
Bernstein229 | but you just link to the licence on the website | 02:28 |
isforinsects | Put a link to the license and explain what it applies to, yeah, that's about all that you need. | 02:28 |
Bernstein229 | ok | 02:29 |
Bernstein229 | because | 02:29 |
Bernstein229 | I compose some music | 02:29 |
Bernstein229 | on my computer | 02:29 |
Bernstein229 | and I was thinking | 02:29 |
Bernstein229 | of makeing a website of them | 02:29 |
Bernstein229 | and using creative commons | 02:29 |
isforinsects | Sure. I've seen blog-format websites like that. | 02:29 |
Bernstein229 | thanks for the information | 02:30 |
Bernstein229 | I might register on the forums | 02:30 |
Bernstein229 | I mean | 02:30 |
Bernstein229 | wiki | 02:30 |
parkerhiggins | Bernstein229: if you're worried about licensing more than you intend, you can include language along the lines of "music licensed under [cc]" | 02:32 |
parkerhiggins | i've seen that done | 02:32 |
Bernstein229 | ok | 02:32 |
Bernstein229 | thx for the help | 02:33 |
*** bheekling has joined #cc | 02:45 | |
*** Bernstein229 has quit IRC | 02:49 | |
*** pmiller has joined #cc | 03:13 | |
*** paulproteus has joined #cc | 03:20 | |
*** rutski has joined #cc | 03:20 | |
*** rutski has left #cc | 03:21 | |
*** sama has quit IRC | 03:27 | |
*** isforinsects has quit IRC | 03:33 | |
*** sama has joined #cc | 03:37 | |
*** RoCky`` has joined #cc | 03:50 | |
*** paulproteus has quit IRC | 04:49 | |
*** paulproteus has joined #cc | 04:51 | |
*** BobChao has left #cc | 04:52 | |
*** rejo1 has quit IRC | 05:30 | |
*** rejon has joined #cc | 05:36 | |
*** tvol has joined #CC | 06:30 | |
*** ankitg has quit IRC | 06:51 | |
*** ankitg has joined #cc | 07:07 | |
*** ankitg has quit IRC | 07:11 | |
*** ankitg has joined #cc | 07:15 | |
*** tvol has quit IRC | 07:16 | |
*** RoCky`` has quit IRC | 07:17 | |
*** ankitg has quit IRC | 07:46 | |
*** rejo1 has joined #cc | 07:49 | |
*** rejon has quit IRC | 07:57 | |
*** pmiller has quit IRC | 08:19 | |
*** kristallpirat has joined #cc | 08:29 | |
*** BobChao has joined #cc | 09:46 | |
*** BobChao has left #cc | 09:48 | |
*** tvol has joined #CC | 10:01 | |
*** tvol has quit IRC | 10:03 | |
*** tvol has joined #CC | 10:03 | |
*** rejon has joined #cc | 10:11 | |
*** rejon has quit IRC | 10:17 | |
*** tvol_ has joined #CC | 10:21 | |
*** rejo1 has quit IRC | 10:21 | |
*** tvol__ has joined #CC | 10:22 | |
*** tvol_ has quit IRC | 10:22 | |
*** tvol_ has joined #CC | 10:24 | |
*** tvol_ has quit IRC | 10:26 | |
*** tvol__ has quit IRC | 10:27 | |
*** tvol has quit IRC | 10:27 | |
*** rejon has joined #cc | 10:45 | |
*** rohitj has joined #cc | 10:46 | |
*** BobChao has joined #cc | 10:50 | |
*** nathany has joined #cc | 10:51 | |
*** ajbrooks has joined #cc | 11:10 | |
*** nkinkade has joined #cc | 11:11 | |
*** jgay has joined #cc | 11:21 | |
*** Bovinity has joined #cc | 11:26 | |
*** quin has joined #cc | 11:30 | |
*** quin has left #cc | 11:36 | |
*** sama has quit IRC | 11:36 | |
*** Mihai`` has joined #cc | 11:59 | |
*** stevel has joined #cc | 11:59 | |
paulproteus | Hey now everybody now. | 12:00 |
paulproteus | nkinkade, SYN | 12:03 |
nkinkade | Hi, paulproteus | 12:04 |
paulproteus | Actually, let me delay that for a sec. | 12:04 |
paulproteus | But good morning. (-: | 12:04 |
paulproteus | nkinkade, What was the ssh-vulnkey command you used to generate that email? | 12:04 |
nkinkade | I cut and pasted the relevant items, but it was $ sudo ssh-vulnkey -a | 12:04 |
paulproteus | sudo ssh-vulnkey -a # seems to do it | 12:04 |
* paulproteus nods | 12:04 | |
paulproteus | When I said before that I had removed the keys from my $HOME, I thought that was because that was all the places I had left keys. Sorry about that. | 12:06 |
paulproteus | FWIW, the gitosis keydir won't be searched by ssh-vulnkey. | 12:06 |
paulproteus | But ~svn/.ssh/ would be. | 12:06 |
paulproteus | I'm looking at those two right now. | 12:06 |
paulproteus | (man ssh-vulnkey - it only checks $HOME/~.ssh/id* ) | 12:08 |
paulproteus | I | 12:09 |
paulproteus | I'm going to move ~svn/.ssh/id_dsa* to ~svn/.ssh/evil/ since it's also compromised. | 12:09 |
paulproteus | (And generated a new RSA key for svn@a6.) | 12:09 |
nkinkade | ssh-vulnkey doesn't search the gitosis keydir, but it does search the $GITOSIS_HOME/.ssh/authorized_keys. | 12:10 |
paulproteus | Ah-hah! | 12:11 |
paulproteus | Good point. | 12:11 |
paulproteus | There, git and svn handled. | 12:14 |
paulproteus | Sorry about me being a moron in the above and weekend discussion of ssh-vulnkey. | 12:14 |
*** BobChao has quit IRC | 12:17 | |
nkinkade | paulproteus: You weren't being a moron. It took me a while to figure out where ssh-vulnkey was getting all the keys, though I could have figured it out by looking in /etc/passwd. I think it's a slight flaw in ssh-vulnkey that it often doesn't produce the full path to the file where it found the vulnerable key. | 12:19 |
paulproteus | It never does, as far as I can tell. | 12:20 |
paulproteus | It only produces the comment section of the key. | 12:20 |
paulproteus | Which is sometimes a pathname. | 12:20 |
paulproteus | I think you should /usr/bin/reportbug and file a Debian bug against ssh-vulnkey and see if they'll add that. (-: | 12:20 |
nkinkade | It seems to in the case of actual key files such as id_dsa and id_dsa.pub, for example. | 12:20 |
paulproteus | Oh, interesting. | 12:20 |
paulproteus | Also fwiw, it's Perl, so you might do well to hack it and submit a patch with that bug. (-; | 12:20 |
paulproteus | (iirc) | 12:20 |
paulproteus | Wait, never mind, the current one isn't Perl. | 12:21 |
paulproteus | The demo app last Tuesday was in Perl. | 12:21 |
nkinkade | It sure would be handy, and I imagine that it would be trivial to implement. Yeah, it's an ELF binary, but I bet it would be easy enough to implement that even I, who doesn't know the first thing about C, could probably implement it. | 12:22 |
*** Lop has joined #cc | 12:24 | |
*** Lop has left #cc | 12:24 | |
nathany | paulproteus: SYN | 12:25 |
paulproteus | nathany, GOODMORNING | 12:26 |
nathany | :) | 12:26 |
nathany | git question (of course) | 12:26 |
nathany | doing "git pull" on a repository gives me the following message | 12:26 |
nathany | You asked me to pull without telling me which branch you | 12:26 |
nathany | want to merge with, and 'branch.master.merge' in | 12:26 |
nathany | your configuration file does not tell me either. Please | 12:26 |
nathany | name which branch you want to merge on the command line and | 12:26 |
nathany | try again (e.g. 'git pull <repository> <refspec>'). | 12:26 |
nathany | See git-pull(1) for details on the refspec. | 12:26 |
paulproteus | Probably a git-svn repository, right? | 12:26 |
nathany | nope | 12:26 |
paulproteus | Ah, excellent. | 12:26 |
paulproteus | Here's my suspicion. | 12:27 |
nathany | did i forget to add the origin pointing @ gitosis? | 12:27 |
paulproteus | When you created your current branch, you didn't tell git that which origin/* branch you wanted to track. | 12:27 |
paulproteus | If you look in .git/config, things will hopefully be clearer. | 12:27 |
nathany | ok | 12:27 |
nathany | .git/config contains: | 12:27 |
nathany | [remote "origin"] | 12:27 |
nathany | url = git@code.creativecommons.org:semtech2008 | 12:27 |
nathany | fetch = +refs/heads/*:refs/remotes/origin/* | 12:27 |
paulproteus | But what about what I said about your current branch? | 12:28 |
nathany | i don't understand that statement | 12:28 |
paulproteus | BTW, if you ask git to "git fetch ; git merge origin/master" it will merge origin/master into your current branch? | 12:28 |
paulproteus | Er, the above wasn't a question but at statement. | 12:28 |
paulproteus | (a) | 12:28 |
paulproteus | $ git branch | 12:28 |
paulproteus | (b) What's it .git/config for that branch? | 12:28 |
nathany | * master | 12:28 |
nathany | i see no reference to that in .git/config | 12:29 |
paulproteus | Interesting. | 12:29 |
nathany | this was a new repository, which is why the statement about "branch" didn't make any sense to me | 12:29 |
paulproteus | For me, I have in my .git/config for a git clone: | 12:29 |
paulproteus | [branch "master"] | 12:29 |
paulproteus | remote = origin | 12:29 |
paulproteus | merge = refs/heads/master | 12:29 |
nathany | hrm | 12:29 |
paulproteus | If origin/master is the one you want to merge in, you can "git merge origin/master", which will merge origin/master with your local changes (if any; otherwise it'll do a fast forward). | 12:30 |
paulproteus | How did you create this local git repo, by doing "git clone <something>"? | 12:30 |
nathany | no | 12:30 |
nathany | git init | 12:30 |
paulproteus | Then git remote add? | 12:30 |
paulproteus | Then git push --all or something to origin? | 12:30 |
nathany | then (probably) git remote add origin git@YOUR_SERVER_HOSTNAME:free_monkey.git | 12:30 |
nathany | (from the gitosis docs) | 12:30 |
paulproteus | (/me nods) | 12:31 |
nathany | i thought i might have forgotten that line, but assume the info in .git/config implies i didn't | 12:31 |
nathany | (that and the fact i've been able to push) | 12:31 |
paulproteus | The problem is that this branch "master" isn't aware of the default thing to pull from. | 12:31 |
paulproteus | It's not specified in your .git/config. | 12:31 |
paulproteus | That makes sense since when the local branch "master" was created, there was nothing to pull from! | 12:31 |
nathany | right | 12:31 |
nathany | i guess i thought add the "origin" was enough | 12:31 |
nathany | add == adding | 12:32 |
paulproteus | So if you want to merge from origin/master, you can either do the manual "git merge origin/master" every time, or you can instead specify it in the .git/config as I pasted. | 12:32 |
paulproteus | Every branch has its own awareness of which branch to pull what things from. | 12:32 |
paulproteus | Er, correction: | 12:32 |
paulproteus | Every branch has its own awareness of which branch is used as the default merge operation when "git pull" is called. | 12:32 |
nathany | every branch or every cloned repository? | 12:32 |
paulproteus | Every (local) branch. | 12:33 |
paulproteus | Now, cloned repositories automatically create a local branch called "master" that is set to merge from origin/master. | 12:33 |
paulproteus | That's a "git clone" convenience. | 12:33 |
nathany | so i have to remember to edit git config in addition to running git remote origin blah, blah blah when i want to create a new repository w/storage @ code.cc.org? | 12:33 |
nathany | (or push, delete, pull, i suppose) | 12:34 |
paulproteus | Unless you want to "git merge origin/master" instead of "git pull", yes. | 12:34 |
nathany | wow, that's sort of a pain in the ass | 12:34 |
paulproteus | I can see what you mean, but somehow I'm unfazed. | 12:35 |
*** Mihai`` has quit IRC | 12:35 | |
paulproteus | The fact that you have a remote doesn't mean you always want to merge your current branch with it. | 12:35 |
nathany | it makes sense, it just seems that if you assert something is your origin you're making a stronger statement than git is | 12:35 |
paulproteus | Oh, okay. | 12:35 |
nathany | right, but i'm calling it "origin" for a reason | 12:35 |
paulproteus | Convention vs. Configuration: Round 1.023e21, FIGHT! | 12:35 |
nathany | i can totally understand the behavior, it just seems that the perfect is the enemy of the good in this case | 12:36 |
nathany | heh | 12:36 |
* nathany goes back to writing slides in Slidy and crying on the inside | 12:36 | |
Bovinity | "Slidy"? That inspires hope. | 12:37 |
paulproteus | It appears to be W3C-brand S3. | 12:37 |
Bovinity | hope++ :< | 12:37 |
paulproteus | Is that a moustache? | 12:37 |
nathany | it's like S5 but (iirc) has slightly cleaner markup for the slide divs | 12:38 |
paulproteus | Er, yeah, S5 != S3. | 12:38 |
nathany | and doing the slide backgrounds, etc is slightly saner as well | 12:39 |
nathany | (although to be honest i haven't looked at S5 in the past 6 months... i just have Slidy templates+CC now that work so I start with those) | 12:39 |
nathany | CC -> CSS, that is | 12:39 |
paulproteus | class="incremental" | 12:40 |
nathany | what of it? | 12:40 |
paulproteus | Nothing, it just sounds reasonably nice. | 12:41 |
paulproteus | No need to get defensive! | 12:41 |
*** Mihai`` has joined #cc | 12:43 | |
*** Mihai`` has quit IRC | 12:47 | |
nkinkade | nathany: Can you think of a good reason why country_code for Catalonia shouldn't be es-ca, or something like that? I feel like I had a good reason a couple months ago, but now I can't remember it. It was why I had implemented the flag_code in the Planet configs, so that we could keep the country code as "es", but it's causing the Spanish flag to show up for Catalonia posts under Jurisdiction News. | 12:49 |
paulproteus | nkinkade, FWIW, Catalonia is definitely not a flavor of Spain. | 13:33 |
paulproteus | Isn't it a separate Nation without a State? | 13:33 |
paulproteus | I think that's sort of like calling Palestine part of Israel. | 13:33 |
paulproteus | (As I understand things.) | 13:33 |
nkinkade | It's what is known as an "autonomous community" | 13:35 |
nkinkade | Interestingly, I was just speaking about this with a friend of mine from Spain yesterday. | 13:35 |
nkinkade | My understanding is that it's something more akin to the what goes on in the UK ... or at least more like that than the concept of states. | 13:37 |
Bovinity | i think it's similar to when Scotland was goverened by england, but was a seperate kingdom with their own parliament | 13:38 |
paulproteus | nathany, Are there libraries to *generate* RDFa (pref. from C)? | 13:40 |
paulproteus | I'm thinking of handling http://teamspace.creativecommons.org/Polish_CLI_for_liblicense today. | 13:40 |
nathany | paulproteus: none that i'm aware of | 13:40 |
nathany | wouldn't that just be an HTML generating library? :) | 13:41 |
paulproteus | nathany, woo-hoo! | 13:41 |
paulproteus | Well, an XHTML generating library, preferably one that's aware of RDF semantics. | 13:41 |
paulproteus | (Since RDFa isn't valid HTML except in XHTML with extra XML namespaces, as I recall.) | 13:41 |
nathany | RDFa *can* be valid HTML but isn't necessarily | 13:42 |
paulproteus | Sure, okay. | 13:42 |
*** bheekling has quit IRC | 13:46 | |
*** rohitj has quit IRC | 14:12 | |
paulproteus | nathany, Can you help me figure out AuthKit? | 14:13 |
paulproteus | As far as I can see, no profile data on is stored in Herder anywhere. Do you know the normal way to do that? | 14:13 |
Bovinity | paulproteus: he just stepped out for lunch | 14:13 |
paulproteus | Bovinity, Sweet. (-: | 14:13 |
nathany | paulproteus: I assume by profile data you mean... default language, etc? | 14:15 |
nathany | or real name? | 14:15 |
paulproteus | I was just thinking 'real name' for a start. | 14:15 |
paulproteus | I'm trying to write a /register page, you see. | 14:15 |
nathany | IIRC that's not an AuthKit thing -- you'd create a Profile (or something) model that had a foreign key to the user | 14:15 |
nathany | right | 14:16 |
*** ianloic has quit IRC | 14:24 | |
*** greg-g has joined #cc | 15:11 | |
*** UltraMagnus has joined #cc | 15:47 | |
*** stevel_ has joined #cc | 15:57 | |
*** jonsson has quit IRC | 16:08 | |
*** jonsson has joined #cc | 16:11 | |
*** stevel has quit IRC | 16:12 | |
*** montagg has quit IRC | 16:12 | |
*** montagg has joined #cc | 16:15 | |
*** stevel_ is now known as stevel | 16:16 | |
*** jonsson has quit IRC | 16:20 | |
nkinkade | Bovinity: Is there some major diff. between magpieRSS on a6 and a7? | 16:22 |
nkinkade | The are acting totally differently. | 16:22 |
Bovinity | there shouldn't be | 16:23 |
nkinkade | Bovinity: Why is it that this line: require_once ("magpie/rss_fetch.inc"); is located in the a7 config, but commented out a6? | 16:26 |
Bovinity | nkinkade: it's commented ou on a6? it shouldn't be | 16:28 |
nkinkade | When I uncomment it I get errors about not being able to redefine some function. | 16:29 |
Bovinity | ah, yeah. | 16:29 |
Bovinity | on a6 there's a conflict with wp-includes/rss.php, a conflict that only occurs on a6. | 16:29 |
nkinkade | But why does it only occur on a6? | 16:30 |
Bovinity | never been able to replicate it on any other WP | 16:30 |
nkinkade | I suspect that the problems I'm having with magpie on a6 have to do with some lost functionality. | 16:30 |
nkinkade | ... due the fact that rss_fetch.inc is not included. | 16:31 |
*** montagg has quit IRC | 16:31 | |
*** jonsson has joined #cc | 16:32 | |
nkinkade | Much like http://www.zedshaw.com/rants/rails_is_a_ghetto.html I feel that staging has become a ghetto. | 16:35 |
*** isforinsects has joined #cc | 16:36 | |
nkinkade | The version of the offending function in rss.php on a7 is wrapped in this "if ( !function_exists('parse_w3cdtf') ) :" | 16:41 |
*** greg-g has quit IRC | 16:49 | |
Bovinity | staging is quite a ghetto | 16:50 |
*** greg-g has joined #cc | 16:50 | |
*** greg-g has quit IRC | 16:51 | |
paulproteus | At least, unlike Ruby on Rails, it's safe to rm -rf staging. | 16:53 |
paulproteus | Or maybe I have that backwards! | 16:53 |
*** rejo1 has joined #cc | 16:53 | |
*** rejon has quit IRC | 16:54 | |
paulproteus | I think that at this point, the RPM I made is not bad! | 17:03 |
*** pmiller has joined #cc | 17:13 | |
*** stevel has quit IRC | 17:17 | |
*** stevel has joined #cc | 17:18 | |
*** jgay has quit IRC | 17:28 | |
*** rejo1 has quit IRC | 17:36 | |
*** jonsson has quit IRC | 17:44 | |
*** jonsson has joined #cc | 17:50 | |
*** stevel_ has joined #cc | 17:57 | |
*** kristallpirat has quit IRC | 18:01 | |
*** stevel has quit IRC | 18:13 | |
*** nathany has quit IRC | 18:31 | |
*** Bovinity has quit IRC | 18:36 | |
*** Bovinity has joined #cc | 18:37 | |
*** ajbrooks has left #cc | 18:49 | |
*** tvol has joined #CC | 18:53 | |
*** stevel_ has quit IRC | 19:08 | |
*** stevel has joined #cc | 19:09 | |
nkinkade | Bovinity: paulproteus: The plugin called "Sociable" was causing a6 to auto-load rss.php. Sociable was including wp-includes/rss-functions.php, which itself, being deprecated apparently, does nothing more than include rss.php. | 19:15 |
paulproteus | Magick! | 19:16 |
Bovinity | ah, that would explain it | 19:16 |
Bovinity | we ahd to turn sociable off on a7 due to it fucking something up | 19:16 |
*** UltraMagnus has quit IRC | 19:16 | |
*** Bovinity has quit IRC | 19:42 | |
*** nkinkade has left #cc | 20:02 | |
*** AndyFitz has joined #cc | 20:31 | |
*** stevel has quit IRC | 20:39 | |
*** jgay has joined #cc | 20:45 | |
*** AndyFitz has joined #cc | 20:52 | |
*** rejon has joined #cc | 21:01 | |
*** AndyFitz has quit IRC | 21:01 | |
*** AndyFitz has joined #cc | 21:02 | |
*** Danny_B has quit IRC | 21:43 | |
*** AndyFitz has quit IRC | 21:43 | |
*** Danny_B has joined #cc | 21:44 | |
*** AndyFitz has joined #cc | 22:02 | |
*** luisv has joined #cc | 22:07 | |
*** AndyFitz has quit IRC | 22:07 | |
* luisv waves to the SFans | 22:07 | |
*** tvol has quit IRC | 22:12 | |
*** bheekling has joined #cc | 22:14 | |
*** greg-g has joined #cc | 22:16 | |
*** AndyFitz has joined #cc | 22:25 | |
*** AndyFitz has quit IRC | 22:26 | |
*** AndyFitz has joined #cc | 22:27 | |
*** AndyFitz has quit IRC | 22:33 | |
*** rejo1 has joined #cc | 22:38 | |
*** jgay has quit IRC | 22:40 | |
*** ankitg has joined #cc | 22:48 | |
*** AndyFitz has joined #cc | 22:53 | |
*** rejon has quit IRC | 22:58 | |
*** jonsson has quit IRC | 23:02 | |
*** AndyFitz has quit IRC | 23:18 | |
*** AndyFitz has joined #cc | 23:19 | |
*** AndyFitz has quit IRC | 23:21 | |
*** AndyFitz has joined #cc | 23:21 | |
*** luisv has quit IRC | 23:36 | |
*** luisv has joined #cc | 23:36 | |
*** AndyFitz has quit IRC | 23:37 | |
*** AndyFitz has joined #cc | 23:38 | |
*** luisv has quit IRC | 23:45 | |
*** AndyFitz has quit IRC | 23:51 | |
*** AndyFitz has joined #cc | 23:52 | |
*** rejo1 has quit IRC | 23:54 | |
*** rejon has joined #cc | 23:54 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!