diff --git a/linux/Makefile b/Makefile similarity index 100% rename from linux/Makefile rename to Makefile diff --git a/README.md b/README.md index 0010ce4..1c1cee0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,42 @@ -Workshops, Hackathons, etc -========================== +Linux System Breakfixing +======================== -This repository houses workshop, etc. content put on by OpenSourceCorp. +In this workshop, teams will work to fix the broken deployment of an application +running on a Linux server. + +System Requirements +------------------- + +Note that this workshop content was authored on a Debian Linux machine, and so +the various scripts & utilities are written in support of that. There may be a +few instances of code that is non-portable to BSDs like macOS, but should work +fine on WSL. + +--- + +As a ***workshop administrator***, you will need the following: + +- A terminal emulator capable of running the `bash` shell program + +- [HashiCorp Terraform](https://terraform.io) (if running workshop on a cloud + platform) + +- x + +In addition, for local testing you will need [HashiCorp +Vagrant](https://www.vagrantup.com/), and at least one installation of a +supported Vagrant provider. At the time of this writing, those supported +providers were VirtualBox and `libvirt`. If on WSLv2 on Windows, you will have a +MUCH easier time using the `libvirt` provider. + +--- + +***Workshop participants*** will need the following: + +- An SSH client + - On Windows, this is typically `puTTY` as a standalone tool, or Git Bash or + WSL. macOS should already have the `ssh` client program installed. + - Note: participants will ***not*** need knowledge of SSH key management, etc. + -- auth to the team servers will be password-based. + +- Little enough knowledge of Linux OSes to not figure out how to cheat `:)` diff --git a/linux/Vagrantfile b/Vagrantfile similarity index 100% rename from linux/Vagrantfile rename to Vagrantfile diff --git a/linux/docs/Linux-Workshop.odp b/docs/Linux-Workshop.odp similarity index 100% rename from linux/docs/Linux-Workshop.odp rename to docs/Linux-Workshop.odp diff --git a/linux/dummy-app-src/.gitignore b/dummy-app-src/.gitignore similarity index 100% rename from linux/dummy-app-src/.gitignore rename to dummy-app-src/.gitignore diff --git a/linux/dummy-app-src/dist/linux/app/DEBIAN/control b/dummy-app-src/dist/linux/app/DEBIAN/control similarity index 100% rename from linux/dummy-app-src/dist/linux/app/DEBIAN/control rename to dummy-app-src/dist/linux/app/DEBIAN/control diff --git a/linux/dummy-app-src/dist/linux/app/usr/bin/.env b/dummy-app-src/dist/linux/app/usr/bin/.env similarity index 100% rename from linux/dummy-app-src/dist/linux/app/usr/bin/.env rename to dummy-app-src/dist/linux/app/usr/bin/.env diff --git a/linux/dummy-app-src/go.mod b/dummy-app-src/go.mod similarity index 100% rename from linux/dummy-app-src/go.mod rename to dummy-app-src/go.mod diff --git a/linux/dummy-app-src/main.go b/dummy-app-src/main.go similarity index 100% rename from linux/dummy-app-src/main.go rename to dummy-app-src/main.go diff --git a/linux/dummy-web-app/README.md b/dummy-web-app/README.md similarity index 100% rename from linux/dummy-web-app/README.md rename to dummy-web-app/README.md diff --git a/linux/dummy-web-app/go.mod b/dummy-web-app/go.mod similarity index 100% rename from linux/dummy-web-app/go.mod rename to dummy-web-app/go.mod diff --git a/linux/dummy-web-app/go.sum b/dummy-web-app/go.sum similarity index 100% rename from linux/dummy-web-app/go.sum rename to dummy-web-app/go.sum diff --git a/linux/dummy-web-app/main.go b/dummy-web-app/main.go similarity index 100% rename from linux/dummy-web-app/main.go rename to dummy-web-app/main.go diff --git a/linux/instructions/challenge_0.md b/instructions/challenge_0.md similarity index 100% rename from linux/instructions/challenge_0.md rename to instructions/challenge_0.md diff --git a/linux/instructions/challenge_1.md b/instructions/challenge_1.md similarity index 90% rename from linux/instructions/challenge_1.md rename to instructions/challenge_1.md index e88102b..368add7 100644 --- a/linux/instructions/challenge_1.md +++ b/instructions/challenge_1.md @@ -12,4 +12,4 @@ a Go binary. Take note of any error messages when trying to build it, and fix any issues you find. -NOTE APP NEEDS TO BE CALLED `app`, NOT `main` +(NOTE: the built application needs to be named `app`, NOT `main`) diff --git a/linux/instructions/challenge_2.md b/instructions/challenge_2.md similarity index 100% rename from linux/instructions/challenge_2.md rename to instructions/challenge_2.md diff --git a/linux/instructions/challenge_3.md b/instructions/challenge_3.md similarity index 100% rename from linux/instructions/challenge_3.md rename to instructions/challenge_3.md diff --git a/linux/instructions/challenge_4.md b/instructions/challenge_4.md similarity index 100% rename from linux/instructions/challenge_4.md rename to instructions/challenge_4.md diff --git a/linux/instructions/challenge_5.md b/instructions/challenge_5.md similarity index 94% rename from linux/instructions/challenge_5.md rename to instructions/challenge_5.md index 3f30a12..8271ae0 100644 --- a/linux/instructions/challenge_5.md +++ b/instructions/challenge_5.md @@ -20,9 +20,9 @@ number is: 1. Higher than `6000` -1. *Not* `8080` +2. *Not* `8080` -1. *Not* managed by the `iptables` tool. +3. *Not* managed by the `iptables` tool. Finally, you will want to figure out what firewall issue your own server has that seems to be causing problems, and fix it. diff --git a/linux/instructions/challenge_6.md b/instructions/challenge_6.md similarity index 100% rename from linux/instructions/challenge_6.md rename to instructions/challenge_6.md diff --git a/linux/instructions/challenge_7.md b/instructions/challenge_7.md similarity index 100% rename from linux/instructions/challenge_7.md rename to instructions/challenge_7.md diff --git a/linux/instructions/congrats.md b/instructions/congrats.md similarity index 100% rename from linux/instructions/congrats.md rename to instructions/congrats.md diff --git a/linux/README.md b/linux/README.md deleted file mode 100644 index 1c1cee0..0000000 --- a/linux/README.md +++ /dev/null @@ -1,42 +0,0 @@ -Linux System Breakfixing -======================== - -In this workshop, teams will work to fix the broken deployment of an application -running on a Linux server. - -System Requirements -------------------- - -Note that this workshop content was authored on a Debian Linux machine, and so -the various scripts & utilities are written in support of that. There may be a -few instances of code that is non-portable to BSDs like macOS, but should work -fine on WSL. - ---- - -As a ***workshop administrator***, you will need the following: - -- A terminal emulator capable of running the `bash` shell program - -- [HashiCorp Terraform](https://terraform.io) (if running workshop on a cloud - platform) - -- x - -In addition, for local testing you will need [HashiCorp -Vagrant](https://www.vagrantup.com/), and at least one installation of a -supported Vagrant provider. At the time of this writing, those supported -providers were VirtualBox and `libvirt`. If on WSLv2 on Windows, you will have a -MUCH easier time using the `libvirt` provider. - ---- - -***Workshop participants*** will need the following: - -- An SSH client - - On Windows, this is typically `puTTY` as a standalone tool, or Git Bash or - WSL. macOS should already have the `ssh` client program installed. - - Note: participants will ***not*** need knowledge of SSH key management, etc. - -- auth to the team servers will be password-based. - -- Little enough knowledge of Linux OSes to not figure out how to cheat `:)` diff --git a/linux/score-server/README.md b/score-server/README.md similarity index 100% rename from linux/score-server/README.md rename to score-server/README.md diff --git a/linux/score-server/content/content.go b/score-server/content/content.go similarity index 100% rename from linux/score-server/content/content.go rename to score-server/content/content.go diff --git a/linux/score-server/content/www/index.html b/score-server/content/www/index.html similarity index 100% rename from linux/score-server/content/www/index.html rename to score-server/content/www/index.html diff --git a/linux/score-server/go.mod b/score-server/go.mod similarity index 100% rename from linux/score-server/go.mod rename to score-server/go.mod diff --git a/linux/score-server/go.sum b/score-server/go.sum similarity index 100% rename from linux/score-server/go.sum rename to score-server/go.sum diff --git a/linux/score-server/main.go b/score-server/main.go similarity index 100% rename from linux/score-server/main.go rename to score-server/main.go diff --git a/linux/score-server/pkg/fetch-server/serve.go b/score-server/pkg/fetch-server/serve.go similarity index 100% rename from linux/score-server/pkg/fetch-server/serve.go rename to score-server/pkg/fetch-server/serve.go diff --git a/linux/score-server/pkg/fetch-server/serve_test.go b/score-server/pkg/fetch-server/serve_test.go similarity index 100% rename from linux/score-server/pkg/fetch-server/serve_test.go rename to score-server/pkg/fetch-server/serve_test.go diff --git a/linux/scripts/ci.sh b/scripts/ci.sh similarity index 100% rename from linux/scripts/ci.sh rename to scripts/ci.sh diff --git a/linux/scripts/init-db.sh b/scripts/init-db.sh similarity index 100% rename from linux/scripts/init-db.sh rename to scripts/init-db.sh diff --git a/linux/scripts/init.sh b/scripts/init.sh similarity index 100% rename from linux/scripts/init.sh rename to scripts/init.sh diff --git a/linux/scripts/linux-workshop-admin.sh b/scripts/linux-workshop-admin.sh similarity index 100% rename from linux/scripts/linux-workshop-admin.sh rename to scripts/linux-workshop-admin.sh diff --git a/linux/scripts/provision-ec2-team-parallelizer.sh b/scripts/provision-ec2-team-parallelizer.sh similarity index 100% rename from linux/scripts/provision-ec2-team-parallelizer.sh rename to scripts/provision-ec2-team-parallelizer.sh diff --git a/linux/scripts/provision-ec2.sh b/scripts/provision-ec2.sh similarity index 100% rename from linux/scripts/provision-ec2.sh rename to scripts/provision-ec2.sh diff --git a/linux/scripts/setup-git.sh b/scripts/setup-git.sh similarity index 100% rename from linux/scripts/setup-git.sh rename to scripts/setup-git.sh diff --git a/linux/scripts/test.bats b/scripts/test.bats similarity index 100% rename from linux/scripts/test.bats rename to scripts/test.bats diff --git a/linux/services/dummy-web-app.service b/services/dummy-web-app.service similarity index 100% rename from linux/services/dummy-web-app.service rename to services/dummy-web-app.service diff --git a/linux/services/linux-workshop-admin.service b/services/linux-workshop-admin.service similarity index 100% rename from linux/services/linux-workshop-admin.service rename to services/linux-workshop-admin.service diff --git a/linux/services/linux-workshop-admin.timer b/services/linux-workshop-admin.timer similarity index 100% rename from linux/services/linux-workshop-admin.timer rename to services/linux-workshop-admin.timer diff --git a/linux/services/score-server.service b/services/score-server.service similarity index 100% rename from linux/services/score-server.service rename to services/score-server.service diff --git a/linux/terraform/.gitignore b/terraform/.gitignore similarity index 100% rename from linux/terraform/.gitignore rename to terraform/.gitignore diff --git a/linux/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl similarity index 100% rename from linux/terraform/.terraform.lock.hcl rename to terraform/.terraform.lock.hcl diff --git a/linux/terraform/data.tf b/terraform/data.tf similarity index 100% rename from linux/terraform/data.tf rename to terraform/data.tf diff --git a/linux/terraform/main.tf b/terraform/main.tf similarity index 100% rename from linux/terraform/main.tf rename to terraform/main.tf diff --git a/linux/terraform/outputs.tf b/terraform/outputs.tf similarity index 100% rename from linux/terraform/outputs.tf rename to terraform/outputs.tf diff --git a/linux/terraform/variables.tf b/terraform/variables.tf similarity index 100% rename from linux/terraform/variables.tf rename to terraform/variables.tf