From 61873468a35946f87dc87f6e401024b1930da088 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 13 Apr 2019 00:46:07 +0000 Subject: [PATCH] Updated githook, and tilde.json --- githook.php | 19 ++++++++++++++++++- tilde.json | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/githook.php b/githook.php index b79b5ca..eb012c2 100644 --- a/githook.php +++ b/githook.php @@ -71,7 +71,7 @@ if ($data["repository"]["full_name"] == 'thunix/ansible') { // just a git pull, and is quick. elseif ($data["repository"]["full_name"] == 'thunix/www') { syslog(LOG_INFO, 'WWW Webhook recieved.'); - if ( time () - filemtime ( $www_lastrun ) > $ratelimit ) { + if ( time () - filemtime ( $www_lastrun ) > $ratelimit/30 ) { touch ( $www_dropfile ); touch ( $www_lastrun ); http_response_code(200); @@ -108,5 +108,22 @@ else { syslog(LOG_INFO, "Tea Pot Webhook recieved.\n"); exit(0); } + +$fp = pfsockopen( "tcp://127.0.0.1", 1234, $errno, $errstr ); + +if (!$fp) +{ + echo "ERROR: $errno - $errstr
\n"; +} +socket_set_timeout ($fp, 10); +$msg = "Commit '".$data['commits'][0]["message"]."' was pushed to ".$data["repository"]["full_name"].' by '.$data["pusher"]["login"]; +$msg = trim(preg_replace('/\s+/', ' ', $msg)); +$write = fwrite ($fp, $msg); +fclose($fp); + +if (!$write) { + echo "error writing to port.
"; + next; +} ?> diff --git a/tilde.json b/tilde.json index e4e794f..4c8aee3 100644 --- a/tilde.json +++ b/tilde.json @@ -1 +1 @@ -{"want_users": true, "users": [{"title": "403 Forbidden", "username": "abah"}, {"title": "403 Forbidden", "username": "abimks"}, {"title": "403 Forbidden", "username": "adam"}, {"title": "403 Forbidden", "username": "akoeabi"}, {"title": "Home Page - Anton McClure", "mtime": 1555037105.8218076, "username": "amcclure"}, {"title": "403 Forbidden", "username": "andro"}, {"title": "MySQL Fatal Error", "mtime": 1549477374.0553179, "username": "angelok"}, {"title": "Aniruddh Nishad Web Page - thunix.net", "mtime": 1554357960.6660204, "username": "aniruddh"}, {"title": "Aniruddh Nishad Web Page - thunix.net", "mtime": 1554357960.6660204, "username": "aniruddh"}, {"title": "403 Forbidden", "username": "apple"}, {"title": "403 Forbidden", "username": "arda"}, {"title": "403 Forbidden", "username": "audiofile"}, {"title": "Index of /~ben", "username": "ben"}, {"title": "403 Forbidden", "username": "bercik"}, {"title": "BrendanTCC's lil page on thunix", "mtime": 1550445191.0, "username": "brendantcc"}, {"title": "403 Forbidden", "username": "bullah"}, {"title": "403 Forbidden", "username": "campari"}, {"title": "Index of /~chuck", "username": "chuck"}, {"title": "hmix : ", "mtime": 1553072300.510817, "username": "cyphyx"}, {"title": "403 Forbidden", "username": "dalist"}, {"title": "Index of /~dariusz", "username": "dariusz"}, {"title": "403 Forbidden", "username": "derby"}, {"title": "Your Title Here", "mtime": 1547162566.1007679, "username": "diabla"}, {"title": "Index of /~dragon", "username": "dragon"}, {"title": "Index of /~fosslinux", "username": "fosslinux"}, {"title": "Index of /~freuddy", "username": "freuddy"}, {"title": "No title", "mtime": 1546898454.1457999, "username": "gokce"}, {"title": "Index of /~gooly", "username": "gooly"}, {"title": "403 Forbidden", "username": "hasbullah"}, {"title": "403 Forbidden", "username": "hawaii"}, {"title": "Index of /~hexhaxtron", "username": "hexhaxtron"}, {"title": "Hi", "mtime": 1553567482.745626, "username": "isaac"}, {"title": "403 Forbidden", "username": "janda"}, {"title": "403 Forbidden", "username": "johnc"}, {"title": "403 Forbidden", "username": "jumbajookiba"}, {"title": "403 Forbidden", "username": "jundi"}, {"title": "403 Forbidden", "username": "k4j"}, {"title": "403 Forbidden", "username": "khuxkm"}, {"title": "403 Forbidden", "username": "krystianbajno"}, {"title": "403 Forbidden", "username": "larasaty"}, {"title": "403 Forbidden", "username": "letamesis"}, {"title": "403 Forbidden", "username": "logique"}, {"title": "403 Forbidden", "username": "makassar"}, {"title": "403 Forbidden", "username": "makmur"}, {"title": "403 Forbidden", "username": "mks"}, {"title": "ml at thunix dot cf", "mtime": 1548237923.6255133, "username": "ml"}, {"title": "403 Forbidden", "username": "mom"}, {"title": "Index of /~moskrin", "username": "moskrin"}, {"title": "No title", "mtime": 1553104056.16482, "username": "naglfar"}, {"title": "403 Forbidden", "username": "naruto"}, {"title": "No title", "mtime": 1546826452.5047188, "username": "orliesaurus"}, {"title": "Welcome to the Tilde Operating System Project! - TildeOS Project", "mtime": 1551395893.4820418, "username": "os"}, {"title": "Index of /~panzer", "username": "panzer"}, {"title": "No title", "mtime": 1545595770.8315115, "username": "parik"}, {"title": "403 Forbidden", "username": "pria"}, {"title": "No title", "mtime": 1548114833.6806962, "username": "quetzalcoatl"}, {"title": "403 Forbidden", "username": "r"}, {"title": "403 Forbidden", "username": "rado"}, {"title": "403 Forbidden", "username": "ragnarok"}, {"title": "Index of /~redhat", "username": "redhat"}, {"title": "403 Forbidden", "username": "responsibleracoon"}, {"title": "No title", "mtime": 1546477863.427092, "username": "ringo"}, {"title": "403 Forbidden", "username": "riska"}, {"title": "403 Forbidden", "username": "sata"}, {"title": "Index of /~slip", "username": "slip"}, {"title": "Index of /~smtpsupplicant", "username": "smtpsupplicant"}, {"title": "Index of /~southerntofu", "username": "southerntofu"}, {"title": "Index of /~spanmer", "username": "spanmer"}, {"title": "403 Forbidden", "username": "swann"}, {"title": "TechEmporium's Test Rig", "mtime": 1548830552.0, "username": "techemporium"}, {"title": "Index of /~transfusion", "username": "transfusion"}, {"title": "Index of /~trip", "username": "trip"}, {"title": "Ubergeek", "mtime": 1552954373.3815272, "username": "ubergeek"}, {"title": "403 Forbidden", "username": "ukhuwah"}, {"title": "403 Forbidden", "username": "ultima"}, {"title": "403 Forbidden", "username": "user"}, {"title": "No title", "mtime": 1547590669.223605, "username": "usernameak"}, {"title": "403 Forbidden", "username": "usher"}, {"title": "403 Forbidden", "username": "vgk"}, {"title": "Index of /~vigilant", "username": "vigilant"}, {"title": "No title", "mtime": 1554905997.526542, "username": "wesx"}, {"title": "Index of /~xenialito69", "username": "xenialito69"}, {"title": "403 Forbidden", "username": "z00t"}], "name": "thunix", "url": "https://www.thunix.net", "admin_email": "root@thunix.net", "signup_url": "https://www.thunix.net/signup.php", "description": "Thunix is a community, centered around access to a public *nix system. Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration.", "user_count": 83} \ No newline at end of file +{"url": "https://www.thunix.net", "signup_url": "https://www.thunix.net/signup.php", "name": "thunix", "want_users": true, "admin_email": "root@thunix.net", "user_count": 83, "users": [{"username": "abah", "title": "403 Forbidden"}, {"username": "abimks", "title": "403 Forbidden"}, {"username": "adam", "title": "403 Forbidden"}, {"username": "akoeabi", "title": "403 Forbidden"}, {"mtime": 1555037105.8218076, "username": "amcclure", "title": "Home Page - Anton McClure"}, {"username": "andro", "title": "403 Forbidden"}, {"mtime": 1549477374.0553179, "username": "angelok", "title": "MySQL Fatal Error"}, {"mtime": 1554357960.6660204, "username": "aniruddh", "title": "Aniruddh Nishad Web Page - thunix.net"}, {"mtime": 1554357960.6660204, "username": "aniruddh", "title": "Aniruddh Nishad Web Page - thunix.net"}, {"username": "apple", "title": "403 Forbidden"}, {"username": "arda", "title": "403 Forbidden"}, {"username": "audiofile", "title": "403 Forbidden"}, {"username": "ben", "title": "Index of /~ben"}, {"username": "bercik", "title": "403 Forbidden"}, {"mtime": 1550445191.0, "username": "brendantcc", "title": "BrendanTCC's lil page on thunix"}, {"username": "bullah", "title": "403 Forbidden"}, {"username": "campari", "title": "403 Forbidden"}, {"username": "chuck", "title": "Index of /~chuck"}, {"mtime": 1553072300.510817, "username": "cyphyx", "title": "hmix : "}, {"username": "dalist", "title": "403 Forbidden"}, {"username": "dariusz", "title": "Index of /~dariusz"}, {"username": "derby", "title": "403 Forbidden"}, {"mtime": 1547162566.1007679, "username": "diabla", "title": "Your Title Here"}, {"username": "dragon", "title": "Index of /~dragon"}, {"username": "fosslinux", "title": "Index of /~fosslinux"}, {"username": "freuddy", "title": "Index of /~freuddy"}, {"mtime": 1546898454.1457999, "username": "gokce", "title": "No title"}, {"username": "gooly", "title": "Index of /~gooly"}, {"username": "hasbullah", "title": "403 Forbidden"}, {"username": "hawaii", "title": "403 Forbidden"}, {"username": "hexhaxtron", "title": "Index of /~hexhaxtron"}, {"mtime": 1553567482.745626, "username": "isaac", "title": "Hi"}, {"username": "janda", "title": "403 Forbidden"}, {"username": "johnc", "title": "403 Forbidden"}, {"username": "jumbajookiba", "title": "403 Forbidden"}, {"username": "jundi", "title": "403 Forbidden"}, {"username": "k4j", "title": "403 Forbidden"}, {"username": "khuxkm", "title": "403 Forbidden"}, {"username": "krystianbajno", "title": "403 Forbidden"}, {"username": "larasaty", "title": "403 Forbidden"}, {"username": "letamesis", "title": "403 Forbidden"}, {"username": "logique", "title": "403 Forbidden"}, {"username": "makassar", "title": "403 Forbidden"}, {"username": "makmur", "title": "403 Forbidden"}, {"username": "mks", "title": "403 Forbidden"}, {"mtime": 1548237923.6255133, "username": "ml", "title": "ml at thunix dot cf"}, {"username": "mom", "title": "403 Forbidden"}, {"username": "moskrin", "title": "Index of /~moskrin"}, {"mtime": 1553104056.16482, "username": "naglfar", "title": "No title"}, {"username": "naruto", "title": "403 Forbidden"}, {"mtime": 1546826452.5047188, "username": "orliesaurus", "title": "No title"}, {"mtime": 1551395893.4820418, "username": "os", "title": "Welcome to the Tilde Operating System Project! - TildeOS Project"}, {"username": "panzer", "title": "Index of /~panzer"}, {"mtime": 1545595770.8315115, "username": "parik", "title": "No title"}, {"username": "pria", "title": "403 Forbidden"}, {"mtime": 1548114833.6806962, "username": "quetzalcoatl", "title": "No title"}, {"username": "r", "title": "403 Forbidden"}, {"username": "rado", "title": "403 Forbidden"}, {"username": "ragnarok", "title": "403 Forbidden"}, {"username": "redhat", "title": "Index of /~redhat"}, {"username": "responsibleracoon", "title": "403 Forbidden"}, {"mtime": 1546477863.427092, "username": "ringo", "title": "No title"}, {"username": "riska", "title": "403 Forbidden"}, {"username": "sata", "title": "403 Forbidden"}, {"username": "slip", "title": "Index of /~slip"}, {"username": "smtpsupplicant", "title": "Index of /~smtpsupplicant"}, {"username": "southerntofu", "title": "Index of /~southerntofu"}, {"username": "spanmer", "title": "Index of /~spanmer"}, {"username": "swann", "title": "403 Forbidden"}, {"mtime": 1548830552.0, "username": "techemporium", "title": "TechEmporium's Test Rig"}, {"username": "transfusion", "title": "Index of /~transfusion"}, {"username": "trip", "title": "Index of /~trip"}, {"mtime": 1552954373.3815272, "username": "ubergeek", "title": "Ubergeek"}, {"username": "ukhuwah", "title": "403 Forbidden"}, {"username": "ultima", "title": "403 Forbidden"}, {"username": "user", "title": "403 Forbidden"}, {"mtime": 1547590669.223605, "username": "usernameak", "title": "No title"}, {"username": "usher", "title": "403 Forbidden"}, {"username": "vgk", "title": "403 Forbidden"}, {"username": "vigilant", "title": "Index of /~vigilant"}, {"mtime": 1554905997.526542, "username": "wesx", "title": "No title"}, {"username": "xenialito69", "title": "Index of /~xenialito69"}, {"username": "z00t", "title": "403 Forbidden"}], "description": "Thunix is a community, centered around access to a public *nix system. Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."} \ No newline at end of file