diff --git a/PKGBUILD b/PKGBUILD index a001664..d383a9b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,6 @@ pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')" -pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)" +pkgver="$(git describe --tag --abbrev=0)"."$(( `git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit` + 1 ))"."$(git rev-parse --short HEAD)" pkgrel=1 -pkgrel() { - git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit -} -epoch="$(git log | grep -c commit)" pkgdesc="$(head -n 1 README.md)" arch=("x86_64") url="$(git config remote.origin.url | sed 's/.git$//')" diff --git a/roles/Foundation/README.md b/roles/Foundation/README.md index 930d11a..1f0e142 100644 --- a/roles/Foundation/README.md +++ b/roles/Foundation/README.md @@ -3,26 +3,18 @@ The Foundation is a one-stop shop for source code from AniNIX developers -- it's # Etymology The etymology of the Foundation is twofold. First and foremost, the AniNIX attempts to automate any new package it is using as much as possible, and as such the Foundation holds the very basis on which the AniNIX is built. -Secondly, the Foundation is the third piece of the charity trinity for the AniNIX, along with the Wiki and the [https://aninix.net/pages/charity.php short-term charity projects]. The AniNIX puts a lot of time into designing its projects and making sure they work. Rather than forcing others to redo this work, we offer commented code and documentation so that the process is transparent but the work-by-hand is minimized.[[Category:Charity]] +Secondly, the Foundation is the third piece of the charity trinity for the AniNIX, along with the Wiki and the [https://aninix.net/pages/charity.php short-term charity projects]. The AniNIX puts a lot of time into designing its projects and making sure they work. Rather than forcing others to redo this work, we offer commented code and documentation so that the process is transparent but the work-by-hand is minimized. # Relevant Files and Software -The Git system was created by the Linux project to manage changes to the kernel and has been on the rise for some time among Version Control Systems (VCS's) with projects like GitHub. The AniNIX self-hosts the repositories in [file:///srv/foundation/ the Foundation server folder] on [[Core]]. +The Git system was created by the Linux project to manage changes to the kernel and has been on the rise for some time among Version Control Systems (VCS's) with projects like GitHub. The AniNIX self-hosts the repositories in [the Foundation server folder](file:///srv/foundation/) on Yggdrasil for the sake of the largest filesystem. -[[WebServer]] is configured to translate the repository to [https://aninix.net/foundation/ the Web-accessible format] via the ArchLinux cgit package. Review the package list at that link and identify the source packages you want to use. Then use the following to clone the source, generally best done to /usr/local/src/ on Linux. Please note that the AniNIX uses Webserver translation to eliminate the need for a .git suffix -- web requests will show in CGIT, while Git clone requests will pull the package all from the same URL. Right-click on your package of choice from the web interface's index page and then clone that address. 
-git clone https://aninix.net/foundation/
-
+[WebServer](../WebServer) is configured to translate the repository to [https://foundation.aninix.net/](foundation.aninix.net) via the Gitea package. AniNIX projects will live under that organization. Review the package list at that link and identify the source packages you want to use. The UI will tell you how to copy the link to clone. -New packages should make sure to refer to the [[Development Best Practices]] to ensure they are compliant with standards; if you notice an issue with the Foundation's code, make sure to submit a [[QANs|QAN]]. [[TeamGreen|AniNIX::TeamGreen]] should be running regressions on these projects. +New packages should make sure to refer to the [Development Best Practices](/AniNIX/Wiki/) to ensure they are compliant with standards; if you notice an issue with the Foundation's code, make sure to submit a [[QANs|QAN]]. [[TeamGreen|AniNIX::TeamGreen]] should be running regressions on these projects. You can use [https://aur.archlinux.org/packages/hexedit-advanced-search/ Hexedit] to edit [file:///usr/share/webapps/cgit/cgit.cgi cgit.cgi] to have a different name, such as "AniNIX::Foundation Web". ## Dependencies -For CentOS, one needs to use the following steps to install Mono. Packages like Cryptoworkbench, Heartbeat, Cerberus, and others require this. -* yum install bison gettext glib2 freetype fontconfig libpng libpng-devel libX11 libX11-devel glib2-devel libgdi* libexif glibc-devel urw-fonts java unzip gcc gcc-c++ automake autoconf libtool make bzip2 wget -* [https://download.mono-project.com/sources/mono/ Download Mono source] -* tar xjvf the source package -* configure; make; make install - *Note:* We used to declare the INSTALLER variable at the top of Makefiles, but no longer do. Non-ShadowArch installs should double check dependencies against the PKGBUILD files manually. We will try to keep this list short. # Available Clients @@ -30,18 +22,13 @@ To get a client to access the Foundation, use one of the following or visit * ArchLinux: pacman -S git * Ubuntu: apt-get install git * RHEL/CentOS: yum install git -* Windows: [https://git-scm.com/download/win Go here], but please be aware that file paths and such are coded for Linux. Windows users will need to conduct extensive code review to install these packages. +* Windows: [https://git-scm.com/download/win Git-Bash] is the recommended client. + * Please be aware that file paths and such are coded for Linux. Windows users will need to conduct extensive code review to install these packages. + * Users are also strongly recommended to install [https://www.gpg4win.org/index.html gpg4win] in order to sign commits with their GPG key. * Mac: [https://git-scm.com/download/mac Go here] Each package will need to be checked out individually. -**Alternatively**: ArchLinux users can add the following segment to the bottom of pacman.conf to install the packages as bundled by the AniNIX. We're working on adding GPG signing -- in the meantime, security-conscious users should build from source anyway. -
-[AniNIX::Foundation]
-SigLevel = Optional TrustAll
-Server = https://aninix.net/foundation/
-
- # Equivalents or Competition The most famous equivalent is [https://github.com GitHub]. Other source code control systems exist, including some provided by employers or academic institutions -- GitLab provides an enterprise-style implementation. Other protocol implementations vary widely -- Mercurial, Bazaar, and SVN are other revision control systems others use. We appreciate the flexibility of Git. @@ -62,4 +49,4 @@ All major functional improvements being worked should be tracked in a branch. Th ## Filter-branch to Prune Git maintains a history of all files. If you need to remove files permanently, GitHub maintains [https://help.github.com/articles/removing-sensitive-data-from-a-repository/ an article] on how to use "git filter-branch" to purge it. }} -[[Category:Public_Service]] \ No newline at end of file +[[Category:Public_Service]] diff --git a/roles/Foundation/files/custom/public/assets/js/aninix.js b/roles/Foundation/files/custom/public/assets/js/aninix.js index 5408471..eb86455 100644 --- a/roles/Foundation/files/custom/public/assets/js/aninix.js +++ b/roles/Foundation/files/custom/public/assets/js/aninix.js @@ -24,3 +24,8 @@ function insertNewsSnippet(snippet,tag) { http_request.send(null); } + +/* Contact Obfuscation */ +function insertContactInfo() { + document.getElementById('contact-insert').innerHTML = 'Contact Us:
Emai' + 'l: aninix' + '@' + 'proto' + 'n.me
Phone: (60' + '8) 56' + '1-3607'; +} diff --git a/roles/Foundation/files/custom/templates/home.tmpl b/roles/Foundation/files/custom/templates/home.tmpl index f6350f6..e67ee09 100644 --- a/roles/Foundation/files/custom/templates/home.tmpl +++ b/roles/Foundation/files/custom/templates/home.tmpl @@ -1,94 +1,123 @@ {{template "base/head" .}}
-
-
-
- -
-
-

- AniNIX -

-

Welcome to the network

-
-
-
-
-
-

- - Open source security -

-

- The AniNIX's primary goal is to ensure everyone has access to the knowledge they need to build a low-cost, secure platform. We make all our source-code accessible and open-source. -

-
-
-

- - Contact us anytime -

-

- We run an open IRC network -- we'd love to connect with you there. Not familiar with IRC? No worries -- we have a webchat available. -

-
-
-
-

- - Open documentation -

-

- We maintain a Wiki to document how and why we do what we do. Hopefully, it can both help others to learn more about computing and spark discussion with the community at large. -

-
-
-

- - Downloads -

-

- We offer downloads from our AniNIX/Maat continuous-deployment system, including static files and packages for ArchLinux-style distributions. -

-
-
-
+ + +
-
-

Webapps

-

We host a number of web apps to make our users' lives easier. +

+
-
-
RSS

Singularity

News powered by TT-RSS

-

Yggdrasil

Media powered by Emby

-

Sharingan

Monitoring powered by Graylog

-

Cyberbrain

SFTP Dropbox

+
+

AniNIX

+

Welcome to the network

-
-
-
- +
+ + + +
+ + +
+

+ + Open source security +

+

+ The AniNIX's primary goal is to ensure everyone has access to the knowledge they need to build a low-cost, secure platform. We make all our source-code accessible and open-source. +

+ + +
+

+ + Contact us anytime +

+

+ We run an open IRC network -- we'd love to connect with you there. Not familiar with IRC? No worries -- we have a webchat available. +

+
+ +
+ + + +
+ + +
+

+ + Open documentation +

+

+ We maintain a Wiki to document how and why we do what we do. Hopefully, it can both help others to learn more about computing and spark discussion with the community at large. +

+
+ + +
+

+ + Downloads +

+

+ We offer downloads from our AniNIX/Maat continuous-deployment system, including static files and packages for ArchLinux-style distributions. +

+
+ +
+ + +
+ + +
+
+

Webapps

+

We host a number of web apps to make our users' lives easier. +

+
RSS

Singularity

News powered by TT-RSS

+

Yggdrasil

Media powered by Emby

+

Sharingan

Monitoring powered by Graylog

+

Cyberbrain

SFTP Dropbox

+
+ + +
+ + +
-
+
+ +
+
+
+ + +
+
+

Follow us on social media

We want to stay in touch with you, so we are present on the social media platforms we find applicable.
Have one you want us on? Contact us and let us know!

-
-

 

-
RSS
-
Discord
-
GitHub
-
-
-
-

 

-
+
+

 

+
RSS
+
Discord
+
GitHub
+
+
+
+

 

+
{{template "base/footer" .}} diff --git a/roles/Foundation/files/web-snippets/martialarts/index b/roles/Foundation/files/web-snippets/martialarts/index index 1f687d0..35ba42a 100644 --- a/roles/Foundation/files/web-snippets/martialarts/index +++ b/roles/Foundation/files/web-snippets/martialarts/index @@ -1,86 +1,117 @@ -
-
- -
- -
-
-

- AniNIX Martial Arts -

-

Open-source, research-driven self-defense and personal health

-

AniNIX Martial Arts is a small martial arts collective focusing on research-driven martial arts. Our core style is USHF HapKiDo, but we are influenced by HEMA, Razmafzar, Kali, Shaolin, Silat, JKD, BJJ, and many other systems. We are a research-driven group -- we encourage cross-training with other systems and will bring in new concepts regularly. The class is open to all experience levels, gender identity, gender expression, sexual orientation, religious or cultural identity, socioecomic status, or age (above 14), in Southcentral Wisconsin -- we will fit your training to your needs and goals.

Drop-ins are welcome, and registration is cheap. We hope you'll give us a chance to show you what we can do.

-
-
-
-
-
-

- - Open-source -

-

- We want your training with our system to become a part of your life. This means that we provide access to a revision-controlled copy of our notes that all our students can download, keep, and contribute to. We're tired of the old era where how the system works is kept hidden from students and piecemealed out as a marketing ploy -- we want to be as trasparent as possible in how our program and our martial art function. Transparency keeps our instructors honest and our students engaged -- this means a better martial arts experience for everyone. -

-
-
-

- - Research-driven -

-

- Our system is always growing. We are a United States HapKiDo Federation (USHF) school, and that gives us access to high-quality instructors and seminar material each year from across the US. We also maintain good relationships with other schools in our area -- we want our students to examine what they're learing and make sure that it works, and that means looking at different perspectives. -

-
-
-
-

- - Low-cost -

-

We are non-profit group -- we train because we feel like it makes life better, not to make money. As such, our costs are publicly documented and our rates match the same. Classes will be informed of potential changes to costs well in advance, and we use recurring payments. We want you thinking about your training, not how you're going to pay for it.

-

-

    -
  • Cost: Free
    • -
  • Lessons:Tuesdays 7-8:30 p.m.
    • -
  • Sparring:Tuesdays 6-7 p.m.
    • -
  • Shaolin Workouts: Saturday mornings at 8 a.m.
    • -
  • Location: 225 Blaser Drive, Belleville, WI
    • -
  • What to bring: Exercise clothes and water
    • -

-
-
-

- - Real-life First -

-

- Everyone is welcome! Class attendance is not mandated and belt-testing is not required to train. As a courtesy, please inform the class of your absence or intended late arrival -- real-life comes first, and we're happy to work with your needs. As long as one person shows, we'll have class -- the smaller the class, the more tailored it is, but the bigger classes mean more partners and body types.

-

- Our focus is also on what you will actually use. While we appreciate traditional and esoteric training for self-development, our weekly classes are focused on modern techniques and training methods so that you get the most out of your time. Our goal is to help create a community of prepared and healthy citizens, and we believe martial arts helps build that in a way no other activity can. -

-
-
-
-
- -
-
-
-

Follow us on social media

-

We want to stay in touch with you, so we are present on the social media platforms we find applicable.
Have one you want us on? Contact us and let us know!

-
-
-

 

-
RSS
-
Discord
-
NextDoor
-
-
-
-

 

-
-
-
+ +
+
+ +
+ +
+
+

+ AniNIX Martial Arts +

+

Open-source, research-driven self-defense and personal health

+

AniNIX Martial Arts is a small martial arts collective focusing on research-driven martial arts. Our core style is USHF HapKiDo, but we are influenced by HEMA, Razmafzar, Kali, Shaolin, Silat, JKD, BJJ, and many other systems. We are a research-driven group -- we encourage cross-training with other systems and will bring in new concepts regularly. The class is open to all experience levels, gender identity, gender expression, sexual orientation, religious or cultural identity, socioecomic status, or age (above 14), in Southcentral Wisconsin -- we will fit your training to your needs and goals.

Drop-ins are welcome, and registration is cheap. We hope you'll give us a chance to show you what we can do.

+
+
+
+ + + +
+ + +
+

+ + Open-source +

+

+ We want your training with our system to become a part of your life. This means that we provide access to a revision-controlled copy of our notes that all our students can download, keep, and contribute to. We're tired of the old era where how the system works is kept hidden from students and piecemealed out as a marketing ploy -- we want to be as trasparent as possible in how our program and our martial art function. Transparency keeps our instructors honest and our students engaged -- this means a better martial arts experience for everyone. +

+
+ + +
+

+ + Research-driven +

+

+ Our system is always growing. We are a United States HapKiDo Federation (USHF) school, and that gives us access to high-quality instructors and seminar material each year from across the US. We also maintain good relationships with other schools in our area -- we want our students to examine what they're learing and make sure that it works, and that means looking at different perspectives. +

+
+ +
+ + + +
+ + +
+

+ + Low-cost +

+

We are non-profit group -- we train because we feel like it makes life better, not to make money. As such, our costs are publicly documented and our rates match the same. Classes will be informed of potential changes to costs well in advance, and we use recurring payments. We want you thinking about your training, not how you're going to pay for it.

+

+

    +
  • Cost: Free
    • +
  • Lessons:Tuesdays 7-8:30 p.m.
    • +
  • Sparring:Tuesdays 6-7 p.m.
    • +
  • Shaolin Workouts: Saturday mornings at 8 a.m.
    • +
  • Location: 225 Blaser Drive, Belleville, WI
    • +
  • What to bring: Exercise clothes and water
    • +
  • + +
    • +

+
+ + +
+

+ + Real-life First +

+

+ Everyone is welcome! Class attendance is not mandated and belt-testing is not required to train. As a courtesy, please inform the class of your absence or intended late arrival -- real-life comes first, and we're happy to work with your needs. As long as one person shows, we'll have class -- the smaller the class, the more tailored it is, but the bigger classes mean more partners and body types.

+

+ Our focus is also on what you will actually use. While we appreciate traditional and esoteric training for self-development, our weekly classes are focused on modern techniques and training methods so that you get the most out of your time. Our goal is to help create a community of prepared and healthy citizens, and we believe martial arts helps build that in a way no other activity can. +

+
+ +
+ + + +
+
+
+
+ +
+
+
+ + +
+
+
+

Follow us on social media

+

We want to stay in touch with you, so we are present on the social media platforms we find applicable.
Have one you want us on? Contact us and let us know!

+
+
+

 

+
RSS
+
Discord
+
NextDoor
+
+
+
+

 

+