From 4cd8ce9489ef16a163579ebc434b5185cc4ee27f Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sun, 7 Jul 2019 23:48:21 +0000 Subject: [PATCH] Updated links across the board, and htaccess to allow for githook --- .htaccess | 2 +- articles/faq.md | 6 +++--- articles/gdpr.md | 4 ++-- articles/index.html | 1 - articles/main.md | 4 ++-- articles/server.md | 2 +- articles/tos.md | 4 ++-- articles/userdir.md | 2 +- tilde.json | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 articles/index.html diff --git a/.htaccess b/.htaccess index c459c4d..e895fb7 100644 --- a/.htaccess +++ b/.htaccess @@ -3,5 +3,5 @@ RewriteRule ^index\.php$ wiki.php?page=main [QSA] RewriteRule ^users$ includes/users.php [QSA,L] RewriteRule ^server$ includes/server.php [QSA,L] - RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~) + RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|/githook.php) RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA] diff --git a/articles/faq.md b/articles/faq.md index c941bf0..466c86b 100644 --- a/articles/faq.md +++ b/articles/faq.md @@ -2,9 +2,9 @@ **How do I sign up for an account?** -Simply by going to our [signup page](/signup.php) and filling in the +Simply by going to our [signup page](/signup) and filling in the form. You can ask for help in \#thunix on tilde.chat, or you can -[contact us](/contact.php), if you run into any difficulties. +[contact us](contact), if you run into any difficulties. **Who is running thunix?** @@ -63,4 +63,4 @@ You can use the following for your mail settings (This is Thunderbird's setting screen, but the settings are the same): -[![](https://thunix.net/images/mail.png)](https://thunix.net/images/mail.png) +![](/media/mail.png)](/media/mail.png) diff --git a/articles/gdpr.md b/articles/gdpr.md index 0101293..65f915c 100644 --- a/articles/gdpr.md +++ b/articles/gdpr.md @@ -20,12 +20,12 @@ days. ## How can I request a copy of my data? -You can submit a request at [contact page](/contact.php). We will +You can submit a request at [contact page](/contact). We will endeavor to provide you a copy of all data we store within 14 days. ## How can I request removal of my information? -You can submit a request at [contact page](/contact.php), and we will +You can submit a request at [contact page](/contact), and we will endeavor to remove all personal data of yours from our system within 14 days. However, this will include removal of your user account from our system as well, which will prevent access to most of the services diff --git a/articles/index.html b/articles/index.html deleted file mode 100644 index e9cf1d2..0000000 --- a/articles/index.html +++ /dev/null @@ -1 +0,0 @@ -Apache is functioning normally diff --git a/articles/main.md b/articles/main.md index 1d6a667..7d15cdf 100644 --- a/articles/main.md +++ b/articles/main.md @@ -24,7 +24,7 @@ Join us on IRC on irc.tilde.chat/6697 in the #thunix channel, or just click here for a web client: [![#thunix channel](https://tilde.chat/badges/badge.php?channel=%23thunix)](https://web.tilde.chat/?join=thunix) If you want to sign up for an account, simply open our [signup -form](/signup.php) and provide us with: +form](/signup) and provide us with: * Your contact name * Your email address (so that we can contact you with login details) @@ -47,4 +47,4 @@ thunix will never use proprietary software but users can do that if they wish. This is something they should avoid however. If you want to help keep thunix running, please consider -[donating](donate). +[donating](/donate). diff --git a/articles/server.md b/articles/server.md index bb7417a..9add57e 100644 --- a/articles/server.md +++ b/articles/server.md @@ -40,4 +40,4 @@ irc.tilde.chat/6697, or via a web chat interface located [here](). Thunix hosts mirrors for several FOSS projects. You can see the full mirror list in the sidebar link. - + diff --git a/articles/tos.md b/articles/tos.md index 280d6ff..0f4383f 100644 --- a/articles/tos.md +++ b/articles/tos.md @@ -45,7 +45,7 @@ copyright law. If you want to request for content you own the copyright for to be removed from thunix, please refer to our [abuse reporting -page](/abuse.php). In the email, please identify who you are, if you are +page](/contact). In the email, please identify who you are, if you are the copyright holder or legally representing them, the exact files you want removed with links to the files and infringed content, and contact information such as phone numbers or a reply-to email address. @@ -56,4 +56,4 @@ may be removed immediately. These terms also apply to communication services such as forums, mailing lists, irc channels, newsgroups, and any other service either hosted on or used for thunix. If you come across anything that violates the terms of service, please let us know -with the [abuse reporting page](/abuse.php). +with the [abuse reporting page](/contact). diff --git a/articles/userdir.md b/articles/userdir.md index cb6327a..d0d9b1f 100644 --- a/articles/userdir.md +++ b/articles/userdir.md @@ -2,4 +2,4 @@ Below is a list of user web directories: - + diff --git a/tilde.json b/tilde.json index 3df6046..e75205f 100644 --- a/tilde.json +++ b/tilde.json @@ -1 +1 @@ -{"user_count": 91, "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.", "want_users": true, "signup_url": "https://www.thunix.net/signup.php", "name": "thunix", "admin_email": "root@thunix.net", "users": [{"username": "adam", "title": "Home Page", "mtime": 1560174524.2028594}, {"username": "akoeabi", "title": "403 Forbidden"}, {"username": "amcclure", "title": "Home Page - Anton McClure", "mtime": 1558816235.026497}, {"username": "aniruddh", "title": "Aniruddh Nishad Web Page - thunix.net", "mtime": 1556126718.442162}, {"username": "aniruddh", "title": "Aniruddh Nishad Web Page - thunix.net", "mtime": 1556126718.442162}, {"username": "apple", "title": "403 Forbidden"}, {"username": "arch3r", "title": "Index of /~arch3r"}, {"username": "arch3r", "title": "Index of /~arch3r"}, {"username": "arda", "title": "403 Forbidden"}, {"username": "ben", "title": "Index of /~ben"}, {"username": "bercik", "title": "403 Forbidden"}, {"username": "brendantcc", "title": "BrendanTCC's lil page on thunix", "mtime": 1550445191.0}, {"username": "chuck", "title": "Index of /~chuck"}, {"username": "cyphyx", "title": "hmix : ", "mtime": 1553072300.510817}, {"username": "dalist", "title": "403 Forbidden"}, {"username": "dariusz", "title": "Index of /~dariusz"}, {"username": "diabla", "title": "Your Title Here", "mtime": 1547162566.1007679}, {"username": "dot", "title": "Index of /~dot"}, {"username": "dot", "title": "Index of /~dot"}, {"username": "dovahkin", "title": "Index of /~dovahkin"}, {"username": "dovahkin", "title": "Index of /~dovahkin"}, {"username": "fosslinux", "title": "Index of /~fosslinux"}, {"username": "gokce", "title": "No title", "mtime": 1546898454.1457999}, {"username": "golden", "title": "Index of /~golden"}, {"username": "golden", "title": "Index of /~golden"}, {"username": "gooly", "title": "Index of /~gooly"}, {"username": "growl", "title": "Index of /~growl"}, {"username": "growl", "title": "Index of /~growl"}, {"username": "hawaii", "title": "403 Forbidden"}, {"username": "hexhaxtron", "title": "Index of /~hexhaxtron"}, {"username": "isaac", "title": "Hi", "mtime": 1553567482.745626}, {"username": "khuxkm", "title": "No title", "mtime": 1560518322.871667}, {"username": "krystianbajno", "title": "403 Forbidden"}, {"username": "lytedev", "title": "Index of /~lytedev"}, {"username": "lytedev", "title": "Index of /~lytedev"}, {"username": "mandlebroth", "title": "Index of /~mandlebroth"}, {"username": "mandlebroth", "title": "Index of /~mandlebroth"}, {"username": "marc", "title": "Index of /~marc"}, {"username": "marc", "title": "Index of /~marc"}, {"username": "ml", "title": "ml at thunix dot cf", "mtime": 1548237923.6255133}, {"username": "moskrin", "title": "Index of /~moskrin"}, {"username": "mspe", "title": "Index of /~mspe"}, {"username": "mspe", "title": "Index of /~mspe"}, {"username": "naglfar", "title": "No title", "mtime": 1558667490.1437056}, {"username": "orliesaurus", "title": "No title", "mtime": 1546826452.5047188}, {"username": "os", "title": "Welcome to the Tilde Operating System Project! - TildeOS Project", "mtime": 1551395893.4820418}, {"username": "philip", "title": "Index of /~philip"}, {"username": "philip", "title": "Index of /~philip"}, {"username": "quetzalcoatl", "title": "No title", "mtime": 1548114833.6806962}, {"username": "r", "title": "403 Forbidden"}, {"username": "rain", "title": "Index of /~rain"}, {"username": "rain", "title": "Index of /~rain"}, {"username": "redhat", "title": "403 Forbidden"}, {"username": "ringo", "title": "No title", "mtime": 1546477863.427092}, {"username": "riska", "title": "403 Forbidden"}, {"username": "sancho", "title": "Sancho's Blog", "mtime": 1559426832.6894953}, {"username": "sancho", "title": "Sancho's Blog", "mtime": 1559426832.6894953}, {"username": "sata", "title": "403 Forbidden"}, {"username": "serafeim", "title": "Index of /~serafeim"}, {"username": "serafeim", "title": "Index of /~serafeim"}, {"username": "skirk", "title": "Index of /~skirk"}, {"username": "skirk", "title": "Index of /~skirk"}, {"username": "slip", "title": "Index of /~slip"}, {"username": "smtpsupplicant", "title": "\nHome Page of Thunix[Bot] - thunix", "mtime": 1558205231.1281123}, {"username": "southerntofu", "title": "Index of /~southerntofu"}, {"username": "spanmer", "title": "Index of /~spanmer"}, {"username": "stenli990801", "title": "Index of /~stenli990801"}, {"username": "stenli990801", "title": "Index of /~stenli990801"}, {"username": "swann", "title": "403 Forbidden"}, {"username": "techemporium", "title": "TechEmporium's Test Rig", "mtime": 1560572814.0}, {"username": "thekingofbandit", "title": "Mohammad Khanafi | Alpha Software Dev", "mtime": 1559105182.035419}, {"username": "thekingofbandit", "title": "Mohammad Khanafi | Alpha Software Dev", "mtime": 1559105182.035419}, {"username": "tomjerr", "title": "Index of /~tomjerr"}, {"username": "tomjerr", "title": "Index of /~tomjerr"}, {"username": "transfusion", "title": "Index of /~transfusion"}, {"username": "trip", "title": "Index of /~trip"}, {"username": "ubergeek", "title": "Ubergeek", "mtime": 1557421611.0964253}, {"username": "user", "title": "403 Forbidden"}, {"username": "usernameak", "title": "No title", "mtime": 1547590669.223605}, {"username": "usher", "title": "403 Forbidden"}, {"username": "vgk", "title": "403 Forbidden"}, {"username": "victoralt", "title": "Index of /~victoralt"}, {"username": "victoralt", "title": "Index of /~victoralt"}, {"username": "virus", "title": "Index of /~virus"}, {"username": "virus", "title": "Index of /~virus"}, {"username": "wesx", "title": "No title", "mtime": 1554905997.526542}, {"username": "wie", "title": "Index of /~wie"}, {"username": "wie", "title": "Index of /~wie"}, {"username": "xenialito69", "title": "Index of /~xenialito69"}, {"username": "yximdoa", "title": "Index of /~yximdoa"}, {"username": "yximdoa", "title": "Index of /~yximdoa"}], "url": "https://www.thunix.net"} \ No newline at end of file +{"users": [{"username": "adam", "mtime": 1560174524.2028594, "title": "Home Page"}, {"username": "akoeabi", "title": "403 Forbidden"}, {"username": "amcclure", "title": "403 Forbidden"}, {"username": "aniruddh", "mtime": 1556126718.442162, "title": "Aniruddh Nishad Web Page - thunix.net"}, {"username": "aniruddh", "mtime": 1556126718.442162, "title": "Aniruddh Nishad Web Page - thunix.net"}, {"username": "apple", "title": "403 Forbidden"}, {"username": "arch3r", "title": "Index of /~arch3r"}, {"username": "arch3r", "title": "Index of /~arch3r"}, {"username": "arda", "title": "403 Forbidden"}, {"username": "ben", "title": "Index of /~ben"}, {"username": "bercik", "title": "403 Forbidden"}, {"username": "brendantcc", "mtime": 1550445191.0, "title": "BrendanTCC's lil page on thunix"}, {"username": "chuck", "title": "Index of /~chuck"}, {"username": "cyphyx", "mtime": 1553072300.510817, "title": "hmix : "}, {"username": "dalist", "title": "403 Forbidden"}, {"username": "dariusz", "title": "Index of /~dariusz"}, {"username": "diabla", "mtime": 1547162566.1007679, "title": "Your Title Here"}, {"username": "dot", "title": "Index of /~dot"}, {"username": "dot", "title": "Index of /~dot"}, {"username": "dovahkin", "title": "Index of /~dovahkin"}, {"username": "dovahkin", "title": "Index of /~dovahkin"}, {"username": "fosslinux", "title": "Index of /~fosslinux"}, {"username": "gokce", "mtime": 1546898454.1457999, "title": "No title"}, {"username": "golden", "title": "Index of /~golden"}, {"username": "golden", "title": "Index of /~golden"}, {"username": "gooly", "title": "Index of /~gooly"}, {"username": "growl", "title": "Index of /~growl"}, {"username": "growl", "title": "Index of /~growl"}, {"username": "haivets", "title": "Index of /~haivets"}, {"username": "haivets", "title": "Index of /~haivets"}, {"username": "hawaii", "title": "403 Forbidden"}, {"username": "hexhaxtron", "title": "Index of /~hexhaxtron"}, {"username": "isaac", "mtime": 1553567482.745626, "title": "Hi"}, {"username": "khuxkm", "mtime": 1560518322.871667, "title": "No title"}, {"username": "krystianbajno", "title": "403 Forbidden"}, {"username": "linel", "title": "Index of /~linel"}, {"username": "linel", "title": "Index of /~linel"}, {"username": "lytedev", "title": "Index of /~lytedev"}, {"username": "lytedev", "title": "Index of /~lytedev"}, {"username": "mandelbroth", "title": "Index of /~mandelbroth"}, {"username": "mandlebroth", "mtime": 1561412499.224826, "title": "Test"}, {"username": "mandlebroth", "mtime": 1561412499.224826, "title": "Test"}, {"username": "marc", "title": "Index of /~marc"}, {"username": "marc", "title": "Index of /~marc"}, {"username": "ml", "mtime": 1548237923.6255133, "title": "ml at thunix dot cf"}, {"username": "moskrin", "title": "Index of /~moskrin"}, {"username": "mspe", "title": "Index of /~mspe"}, {"username": "mspe", "title": "Index of /~mspe"}, {"username": "naglfar", "mtime": 1558667490.1437056, "title": "No title"}, {"username": "orliesaurus", "mtime": 1546826452.5047188, "title": "No title"}, {"username": "os", "mtime": 1551395893.4820418, "title": "Welcome to the Tilde Operating System Project! - TildeOS Project"}, {"username": "philip", "title": "Index of /~philip"}, {"username": "philip", "title": "Index of /~philip"}, {"username": "quetzalcoatl", "mtime": 1548114833.6806962, "title": "No title"}, {"username": "r", "title": "403 Forbidden"}, {"username": "rain", "title": "Index of /~rain"}, {"username": "rain", "title": "Index of /~rain"}, {"username": "redhat", "title": "403 Forbidden"}, {"username": "ringo", "mtime": 1546477863.427092, "title": "No title"}, {"username": "riska", "title": "403 Forbidden"}, {"username": "sancho", "mtime": 1559426832.6894953, "title": "Sancho's Blog"}, {"username": "sancho", "mtime": 1559426832.6894953, "title": "Sancho's Blog"}, {"username": "sata", "title": "403 Forbidden"}, {"username": "serafeim", "title": "Index of /~serafeim"}, {"username": "serafeim", "title": "Index of /~serafeim"}, {"username": "skirk", "title": "Index of /~skirk"}, {"username": "skirk", "title": "Index of /~skirk"}, {"username": "slip", "title": "Index of /~slip"}, {"username": "smtpsupplicant", "mtime": 1558205231.1281123, "title": "\nHome Page of Thunix[Bot] - thunix"}, {"username": "southerntofu", "title": "Index of /~southerntofu"}, {"username": "spanmer", "title": "Index of /~spanmer"}, {"username": "stenli990801", "title": "Index of /~stenli990801"}, {"username": "stenli990801", "title": "Index of /~stenli990801"}, {"username": "swann", "title": "403 Forbidden"}, {"username": "thekingofbandit", "mtime": 1559105182.035419, "title": "Mohammad Khanafi | Alpha Software Dev"}, {"username": "thekingofbandit", "mtime": 1559105182.035419, "title": "Mohammad Khanafi | Alpha Software Dev"}, {"username": "tomjerr", "title": "Index of /~tomjerr"}, {"username": "tomjerr", "title": "Index of /~tomjerr"}, {"username": "transfusion", "title": "Index of /~transfusion"}, {"username": "trip", "title": "Index of /~trip"}, {"username": "tux", "title": "Index of /~tux"}, {"username": "tux", "title": "Index of /~tux"}, {"username": "ubergeek", "mtime": 1562260814.4034507, "title": "Ubergeek's site - main"}, {"username": "user", "title": "403 Forbidden"}, {"username": "usernameak", "mtime": 1547590669.223605, "title": "No title"}, {"username": "usher", "title": "403 Forbidden"}, {"username": "vgk", "title": "403 Forbidden"}, {"username": "victoralt", "title": "Index of /~victoralt"}, {"username": "victoralt", "title": "Index of /~victoralt"}, {"username": "virus", "title": "Index of /~virus"}, {"username": "virus", "title": "Index of /~virus"}, {"username": "wesx", "mtime": 1554905997.526542, "title": "No title"}, {"username": "wie", "title": "Index of /~wie"}, {"username": "wie", "title": "Index of /~wie"}, {"username": "xenialito69", "title": "Index of /~xenialito69"}, {"username": "yximdoa", "title": "Index of /~yximdoa"}, {"username": "yximdoa", "title": "Index of /~yximdoa"}], "admin_email": "root@thunix.net", "name": "thunix", "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.", "url": "https://www.thunix.net", "user_count": 97, "want_users": true} \ No newline at end of file