Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

remove stg conditional, add a comment

Browse source 
Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
This commit is contained in:
Rick Elrod 2016-04-21 22:26:03 +00:00
parent 2db9dced18
commit 54a3cadc72
3 changed files with 8 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roles/paste/files/class_urlshort.php
View file

@ -16,21 +16,21 @@ class URLShortener
{ {
public function shorten($long_url) public function shorten($long_url)
{ {
// Don't shorten private pastes.
if(preg_match('/^http(s)?:\/\/(.+).fedoraproject.org\/(\d+)\/(\d+)\/$/', $long_url)) { if(preg_match('/^http(s)?:\/\/(.+).fedoraproject.org\/(\d+)\/(\d+)\/$/', $long_url)) {
return $long_url; return $long_url;
} }
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL,"http://ur1.ca/"); curl_setopt($ch, CURLOPT_URL,"https://da.gd/s");
curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array('longurl' => $long_url))); curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array('url' => $long_url)));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT ,2); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);
curl_setopt($ch, CURLOPT_TIMEOUT, 2); curl_setopt($ch, CURLOPT_TIMEOUT, 2);
$result = curl_exec($ch); $result = curl_exec($ch);
curl_close($ch); curl_close($ch);
preg_match( '/<p class="success">Your ur1 is: <a href="(.+)">(.+)<\/a><\/p>/', $result, $match ); if (!empty($result))
if (!empty($match)) return $result;
return $match[1];
else else
return false; return false;

39
roles/paste/files/class_urlshort_dagd.php
View file

@ -1,39 +0,0 @@
<?php
/**
* Sticky Notes pastebin
* @ver 0.3
* @license BSD License - www.opensource.org/licenses/bsd-license.php
*
* Copyright (c) 2012 Sayak Banerjee <sayakb@kde.org>
* Copyright (c) 2013 Athmane Madjoudj <athmane@fedoraproject.org>
* All rights reserved. Do not remove this copyright notice.
*/
/**
* URL shortener using ur1.ca from Indenti.ca
**/
class URLShortener
{
public function shorten($long_url)
{
if(preg_match('/^http(s)?:\/\/(.+).fedoraproject.org\/(\d+)\/(\d+)\/$/', $long_url)) {
return $long_url;
}
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,"https://da.gd/s");
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array('url' => $long_url)));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);
curl_setopt($ch, CURLOPT_TIMEOUT, 2);
$result = curl_exec($ch);
curl_close($ch);
if (!empty($result))
return $result;
else
return false;
}
}
?>

9
roles/paste/tasks/main.yml
View file

@ -39,17 +39,10 @@
copy: src=sticky-notes.ini dest=/etc/php.d/sticky-notes.ini owner=root group=root mode=644 copy: src=sticky-notes.ini dest=/etc/php.d/sticky-notes.ini owner=root group=root mode=644
notify: reload httpd notify: reload httpd
- name: timeout in case url.ca goes down - name: Use da.gd instead of ur1.ca
copy: src=class_urlshort.php dest=/usr/share/sticky-notes/classes/class_urlshort.php owner=root group=root mode=644 copy: src=class_urlshort.php dest=/usr/share/sticky-notes/classes/class_urlshort.php owner=root group=root mode=644
when: env != 'staging'
notify: reload httpd notify: reload httpd
- name: timeout in case url.ca goes down (with da.gd patch)
copy: src=class_urlshort_dagd.php dest=/usr/share/sticky-notes/classes/class_urlshort.php owner=root group=root mode=644
when: env == 'staging'
notify: reload httpd
- name: set sebooleans so paste can talk to the db - name: set sebooleans so paste can talk to the db
seboolean: name=httpd_can_network_connect_db state=true persistent=true seboolean: name=httpd_can_network_connect_db state=true persistent=true