[02:20:05] Krenair: as always, the changes in wikitech-testing are mine. Do you want to just pick a wiki (1, 2, 3) as your own and I'll always leave it alone? [03:21:33] Betacommand: Sean found the boo-boo (known bug in MariaDB w/ workaround). We applied the workaround and will update the MariaDB as soon as practical. [03:24:07] Commons is catching up as we speak. [15:00:27] @trusted [15:00:27] I trust: .*@wikimedia/.* (2trusted), .*@mediawiki/.* (2trusted), .*@wikimedia/Ryan-lane (2admin), .*@wikipedia/.* (2trusted), .*@nightshade.toolserver.org (2trusted), .*@wikimedia/Krinkle (2admin), .*@[Ww]ikimedia/.* (2trusted), .*@wikipedia/Cyberpower678 (2admin), .*@wirenat2\.strw\.leidenuniv\.nl (2trusted), .*@unaffiliated/valhallasw (2trusted), .*@mediawiki/yuvipanda (2admin), .*@wikipedia/Coren (2admin), [16:14:46] puppet always removes the sites which are enabled in apache: [16:14:48] notice: /Stage[main]/Webserver::Apache2/Apache_site[000-default]/File[/etc/apache2/sites-enabled/000-default]/ensure: removed [16:14:56] how can i prevent that from happening? [16:15:23] Coren? anybody? :) [16:16:07] JohannesK_WMDE: don't use 000-default [16:16:09] use a new file [16:16:12] JohannesK_WMDE: puppet manages sites-enabled; you have to put any content you want in puppet as well. [16:16:16] and let puppet install it [16:16:55] put a new config in sites-available, like mysite.wmflabs.org [16:17:06] then you can use a puppet command to enable it [16:17:14] and it will symlink it into sites-enabled [16:17:45] and ideally then also replace the config with a puppet .erb template later [16:18:00] mutante: sounds good... i just used "a2ensite"... do you know which puppet command i have to use to have it symlink the config? [16:18:37] JohannesK_WMDE: apache_site {} [16:19:13] i'm ignoring for a moment that people work on an even newer method to generate the configs [16:19:18] but the traditional way for me is [16:19:32] put one puppet {} there, with a template for the config [16:19:40] and then apache_site to switch it on [16:19:54] and possible install_certificate{} to get cert [16:19:58] possibly [16:20:56] example: apache_site { 'irc': name => 'irc.wikimedia.org' } [16:21:11] mutante: thanks... so where does the puppet{}... go? a file on my host? [16:22:22] JohannesK_WMDE: in the same puppet class where you use apache_site, first you put a file {} definition with something like [16:22:48] content => template('yourmodule/apache/site.wmflabs.org.erb') [16:23:14] and you put that file into the puppet module path into ./templates/apache/ [16:23:32] JohannesK_WMDE: Are you using a self-hosted puppetmaster? [16:23:33] and inside the the template you just write regular Apache config syntax [16:23:51] but the bonus is, you can use variables where you have stuff like ServerName etc [16:23:56] to make it flexible [16:24:01] JohannesK_WMDE: https://wikitech.wikimedia.org/wiki/Help:Self-hosted_puppetmaster [16:24:22] you can find examples in operations/puppet repo, f.e. module bugzilla [16:25:18] <^d> mutante: Responded to you on rt re: robots.txt [16:25:19] <^d> :) [16:26:03] ^d: thanks! yea, and my point was just that puppet would appear easy to me and "production PHP file" does not [16:26:04] petan: Did you see the problems with wm-bot re "!log", i. e. that wm-bot updates on-wiki, but doesn't report here "Messages has been logged"? [16:26:09] but that depends on who does it:) [16:26:25] <^d> It's been awhile since I've looked at that setup on prod. [16:26:30] <^d> Dunno how easy it would be to reuse. [16:26:33] <^d> It was just a thought :) [16:26:33] same here, that's why :p [16:26:43] we'll figure something out [16:26:50] yea, nod [16:26:53] <^d> Yeah. Main point was "let's not do it by hand anymore" [16:27:00] completely agree [16:27:23] <^d> It came up last night when wikitech was getting pounded by bingbot and andrewbogott asked me about robots.txt. We tossed it in rt so we wouldn't forget :) [16:28:08] so the real question is if we want to be able to have different robots.txt on labs vs. prod (i could imagine we might) AND have an easier fix without lookig at prod setup :) [16:28:17] +puppet:) [16:28:43] <^d> The nice thing is if we mimic prod though, you can configure it on-wiki via [[mediawiki:robots.txt]] [16:28:53] that way you can _test_ changing robots.txt on labs!:) [16:28:59] by NOT using prod [16:29:02] mutante: "in the same puppet class where you use apache_site"... so where (physical location) would that be? i'm 100% clueless about puppet. do i need to edit a file on my host? do i need to put the changes into some repository? i just need apache have the default site (or *any* site) enabled for testing something. [16:29:04] <^d> :) [16:29:35] let's have Coren comment :) *g* [16:30:34] JohannesK_WMDE: oh, it depends, if you just want to test first and not upload it for review anywhere, then what scfc_de said, and the location would be /etc/puppet/ on any labs instance with puppetmaster::self [16:31:10] JohannesK_WMDE: later when you think it's somehow "stable" you upload it to gerrit for code review and when it's merged it's actually on the central puppetmaster [16:31:20] without using that "self" thing [16:32:47] ok, i think i get it. the selfhosted stuff is probably what i want to use for now. later i can get it through code review if needed, and then it's also available for deployment on other hosts (which i don't need currently, at all...) [16:33:20] JohannesK_WMDE: initial work, but once you wrote a working puppet class/module once, you can just fire up instances in labs anytime, hit the configure button.. and magic. it does all the setup exactly like it was [16:33:52] JohannesK_WMDE: I think Silke_WMDE managed the Puppet master for Wikidata, so she might offer some tips (provided you're sitting in the same office :-). [16:33:53] yes, do the selfhosted thing first to get used to it [16:34:10] that way you can just edit files and see the changes [16:34:23] without having to upload to gerrit for others to review every step [16:34:27] mutante: yes, sounds good. thanks. [16:34:37] change to being reviewed once you got the basics up [16:34:39] yw [16:38:53] Hi JohannesK_WMDE - true... but long ago. I used to document here: https://wikitech.wikimedia.org/wiki/Nova_Resource:Wikidata-dev [16:39:59] I can't tell what has changed since then though. [16:40:43] the good thing would be that puppet modules could run on any puppetmaster [16:40:52] so shouldn't matter where you test it [16:41:04] as long as puppet version isn't majorly different [16:42:47] thanks all. [16:48:59] JohannesK_WMDE: after you got the puppet basics running it's like this, so you get an idea https://git.wikimedia.org/blob/operations%2Fpuppet.git/d28cc603d8043695bd7a0f41ffc8597c9c333282/modules%2Fbugzilla%2Fmanifests%2Fapache.pp [16:49:13] (and there's an even better newer way we're supposed to use later) [16:49:35] mutante: I think you are overflooding JohannesK_WMDE a bit :-). [16:50:22] heh, ok, just trying to put it all in there before i switch to other topic again, the multi-tasking,,arg :p