Freeze break request: Enable Basset to 0.3 and enable mediawiki extension

[Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>]

Hi,

Could I get +1s for:

- the following patches

- updating basset on basset01

- running the mediawiki and basset playbooks

This will enable the mediawiki automated cleanup and account blocking.


commit e86a0bb505017454f8e921374d1f593136fdc5ec
Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>
Date:   Tue Mar 22 20:51:07 2016 +0000

    Add ACL for basset frontend
   
    Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>

diff --git a/roles/basset/frontend/tasks/main.yml b/roles/basset/frontend/tasks/main.yml
index 54637ab..d2ccf6b 100644
--- a/roles/basset/frontend/tasks/main.yml
+++ b/roles/basset/frontend/tasks/main.yml
@@ -6,6 +6,15 @@
   - basset
   - basset/frontend
 
+- name: install basset config
+  template: src="" dest=/etc/basset/frontend.cfg
+            user=basset-frontend group=basset-frontend mode=0600
+  notify:
+  - restart httpd
+  tags:
+  - basset
+  - basset/frontend
+
 - name: install staging htpasswd
   copy: src="" dest=/etc/httpd/conf.d/basset.htpasswd
         owner=root group=root mode=0644
diff --git a/roles/basset/frontend/templates/frontend.cfg.j2 b/roles/basset/frontend/templates/frontend.cfg.j2
new file mode 100644
index 0000000..476efa2
--- /dev/null
+++ b/roles/basset/frontend/templates/frontend.cfg.j2
@@ -0,0 +1,6 @@
+[submission_access]
+10.5.126.63 = mediawiki.new,mediawiki.edit
+10.5.126.73 = mediawiki.new,mediawiki.edit
+10.5.126.25 = fedora.fas.registration,fedora.fas.cla_sign
+10.5.126.26 = fedora.fas.registration,fedora.fas.cla_sign
+10.5.126.30 = fedora.fas.registration,fedora.fas.cla_sign

commit b10be2e241a3b270236aa0f35f89609281e75595
Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>
Date:   Tue Mar 22 20:46:39 2016 +0000

    Open iptables on basset for wiki
   
    Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>

diff --git a/inventory/group_vars/basset b/inventory/group_vars/basset
index 5bab0fa..85fc069 100644
--- a/inventory/group_vars/basset
+++ b/inventory/group_vars/basset
@@ -9,6 +9,9 @@ custom_rules: [
     '-A INPUT -p tcp -m tcp -s 10.5.126.25   --dport 80 -j ACCEPT',
     '-A INPUT -p tcp -m tcp -s 10.5.126.26   --dport 80 -j ACCEPT',
     '-A INPUT -p tcp -m tcp -s 10.5.126.30   --dport 80 -j ACCEPT'
+    # wiki01, wiki02
+    '-A INPUT -p tcp -m tcp -s 10.5.126.63   --dport 80 -j ACCEPT'
+    '-A INPUT -p tcp -m tcp -s 10.5.126.73   --dport 80 -j ACCEPT'
 ]
 
 fas_client_groups: sysadmin-main
diff --git a/inventory/group_vars/basset-stg b/inventory/group_vars/basset-stg
index ad45a6f..02049e5 100644
--- a/inventory/group_vars/basset-stg
+++ b/inventory/group_vars/basset-stg
@@ -7,6 +7,8 @@ num_cpus: 2
 custom_rules: [
     # fas01.stg
     '-A INPUT -p tcp -m tcp -s 10.5.126.86   --dport 80 -j ACCEPT',
+    # wiki01.stg
+    '-A INPUT -p tcp -m tcp -s 10.5.126.60   --dport 80 -j ACCEPT',
 ]
 
 fas_client_groups: sysadmin-main

commit bc7f0faabfcef27470398703fdd2cf43a6daf270
Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>
Date:   Tue Mar 22 20:44:02 2016 +0000

    Enable mediawiki basset plugin
   
    Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx>

diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index dc64683..ddf1e8e 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -36,6 +36,7 @@
   - mediawiki119-RSS
   - mediawiki-FedoraBadges
+  - mediawiki119-basset
   - php-zmq
   - php-pecl-uuid
   tags:
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index a6c10b4..3362115 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -324,6 +324,18 @@ require_once "$IP/extensions/fedmsg-emit.php";
 require_once "$IP/extensions/HTTP302Found/HTTP302Found.php";
 require_once "$IP/extensions/intersection/DynamicPageList.php";
 require_once "$IP/extensions/RSS/RSS.php";
+require_once "$IP/extensions/BassetSubmitter.php";
+
+{% if env == "staging" %}
+$basset_url = 'http://basset01.stg.phx2.fedoraproject.org/basset';
+$basset_username = '{{ basset_stg_frontend_user }}';
+$basset_password = '{{ basset_stg_frontend_pass }}';
+{% else %}
+$basset_url = 'http://basset01.phx2.fedoraproject.org/basset';
+$basset_username = '{{ basset_prod_frontend_user }}';
+$basset_password = '{{ basset_prod_frontend_pass }}';
+{% endif %}
+
 
 $wgShowExceptionDetails = true;

_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
http://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx