Compare commits
11 Commits
science-in
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 684f6b1a54 | |||
| b3ec5886e3 | |||
| 2dd66df5c4 | |||
| f70ba8ae25 | |||
| 5477f97f5d | |||
| fa5b134600 | |||
| 20a7f030ef | |||
| 70551d1e75 | |||
| d0f9117515 | |||
| b8fb20b4e4 | |||
| cf60dbcfb8 |
11
README.md
11
README.md
@@ -2,6 +2,8 @@
|
||||
|
||||
Part of the Science in the City Festival - Single-participant learning environments for hands-on Co-op Cloud deployment practice.
|
||||
|
||||
See the [workshop slides](https://git.dailysh.it/nextlevelshit/malta-slides) for detailed presentation and materials.
|
||||
|
||||
## 🚀 Quick Start
|
||||
|
||||
```bash
|
||||
@@ -44,7 +46,7 @@ browser wordpress # Open directly in Firefox
|
||||
## 💾 USB Environment
|
||||
|
||||
Pre-configured with:
|
||||
- **Automatic WiFi connection** to workshop network
|
||||
- **Automatic WiFi connection** to workshop network (CODE_CRISPIES) or public cafe WiFi (APSFreeWiFi)
|
||||
- Docker Swarm + abra installation
|
||||
- SSH client for cloud access
|
||||
- Wildcard DNS resolution (dnsmasq)
|
||||
@@ -83,6 +85,8 @@ The VM simulates the USB experience with identical configuration and commands.
|
||||
|
||||
## 📚 Complete Recipe Catalog
|
||||
|
||||
For the complete list of all recipes, see [RECIPES.md](docs/RECIPES.md)
|
||||
|
||||
Based on Co-op Cloud with quality scoring:
|
||||
|
||||
### ⭐ Tier 1 - Production Ready (Score 5)
|
||||
@@ -154,6 +158,11 @@ browser <TAB> # Shows deployed applications
|
||||
- USB drive (8GB+) for workshop distribution
|
||||
- SSH key at `~/.ssh/id_ed25519.pub` (for cloud deployment only)
|
||||
|
||||
## 📖 Documentation
|
||||
|
||||
- [Manual Network Setup](docs/MANUAL_NETWORK_SETUP.md)
|
||||
- [USB Boot Instructions](docs/USB_BOOT_INSTRUCTIONS.md)
|
||||
|
||||
## 🛠️ Development Tools
|
||||
|
||||
```bash
|
||||
|
||||
83
common.nix
83
common.nix
@@ -267,6 +267,26 @@ isoConfig
|
||||
method = "auto";
|
||||
};
|
||||
};
|
||||
"APSFreeWiFi" = {
|
||||
connection = {
|
||||
id = "APSFreeWiFi";
|
||||
type = "wifi";
|
||||
autoconnect = true;
|
||||
};
|
||||
wifi = {
|
||||
mode = "infrastructure";
|
||||
ssid = "APSFreeWiFi";
|
||||
};
|
||||
wifi-security = {
|
||||
key-mgmt = "none";
|
||||
};
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
};
|
||||
ipv6 = {
|
||||
method = "auto";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -493,8 +513,7 @@ isoConfig
|
||||
systemd.services.workshop-abra-install = {
|
||||
description = "Install abra CLI system-wide with retry logic and proper verification";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "workshop-system-setup.service" ];
|
||||
path = with pkgs; [
|
||||
bash
|
||||
wget
|
||||
@@ -509,36 +528,22 @@ isoConfig
|
||||
];
|
||||
|
||||
script = ''
|
||||
# Enhanced installation with proper verification
|
||||
# Plain abra installation
|
||||
export TERM=xterm-256color
|
||||
export HOME=/root
|
||||
|
||||
# Check if abra is already properly installed (CORRECTED VERIFICATION)
|
||||
# Check if abra is already properly installed
|
||||
if sudo abra --version >/dev/null 2>&1; then
|
||||
echo "✅ abra already installed and functional"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Wait for actual internet connectivity
|
||||
echo "🌐 Waiting for internet connectivity..."
|
||||
for i in {1..30}; do
|
||||
if curl -s --max-time 5 https://abra.coopcloud.tech >/dev/null 2>&1; then
|
||||
echo "✅ Internet connectivity confirmed"
|
||||
break
|
||||
fi
|
||||
if [ $i -eq 30 ]; then
|
||||
echo "❌ No internet connectivity after 60 seconds"
|
||||
exit 1
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
echo "🚀 Installing abra system-wide..."
|
||||
|
||||
# Attempt installation with retry logic
|
||||
for attempt in {1..3}; do
|
||||
echo "🚀 Installing abra (attempt $attempt/3)..."
|
||||
# Plain installation
|
||||
curl -fsSL https://install.abra.coopcloud.tech | bash
|
||||
|
||||
if curl -fsSL https://install.abra.coopcloud.tech | bash; then
|
||||
# Verify installation success using CORRECT check method
|
||||
# Verify installation
|
||||
if sudo abra --version >/dev/null 2>&1; then
|
||||
echo "✅ abra installed successfully"
|
||||
|
||||
@@ -550,28 +555,17 @@ isoConfig
|
||||
|
||||
exit 0
|
||||
else
|
||||
echo "⚠️ Installation script completed but abra not functional"
|
||||
fi
|
||||
else
|
||||
echo "❌ Installation attempt $attempt failed"
|
||||
fi
|
||||
|
||||
if [ $attempt -lt 3 ]; then
|
||||
echo "⏳ Retrying in 10 seconds..."
|
||||
sleep 10
|
||||
fi
|
||||
done
|
||||
|
||||
echo "❌ abra installation failed after 3 attempts"
|
||||
echo "❌ abra installation failed"
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
User = "root";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "30s";
|
||||
User = "root";
|
||||
Environment = [
|
||||
"TERM=xterm-256color"
|
||||
"HOME=/root"
|
||||
@@ -1208,7 +1202,7 @@ isoConfig
|
||||
install() {
|
||||
echo "🔄 Checking and repairing abra installation..."
|
||||
|
||||
# Use the CORRECT check method (matches service verification)
|
||||
# Check if abra is already installed
|
||||
if sudo abra --version >/dev/null 2>&1; then
|
||||
echo "✅ abra is already installed and functional"
|
||||
return 0
|
||||
@@ -1217,18 +1211,17 @@ isoConfig
|
||||
echo "🔄 Restarting abra installation service..."
|
||||
sudo systemctl restart workshop-abra-install
|
||||
|
||||
# Monitor installation progress
|
||||
echo "📊 Monitoring installation..."
|
||||
for i in {1..30}; do
|
||||
# Wait for service to complete
|
||||
sleep 5
|
||||
|
||||
# Check if installation succeeded
|
||||
if sudo abra --version >/dev/null 2>&1; then
|
||||
echo "✅ abra installation completed successfully!"
|
||||
return 0
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
|
||||
echo "❌ Installation still not complete. Check status:"
|
||||
else
|
||||
echo "❌ Installation failed. Try running 'install' again or check status:"
|
||||
echo " sudo systemctl status workshop-abra-install"
|
||||
fi
|
||||
}
|
||||
|
||||
recipes() {
|
||||
|
||||
@@ -91,6 +91,7 @@
|
||||
| mailman3 | 3 | The GNU Mailing List Management System | [https://recipes.coopcloud.tech/mailman3](https://recipes.coopcloud.tech/mailman3) |
|
||||
| mailu | 3 | A simple yet full-featured mail server | [https://recipes.coopcloud.tech/mailu](https://recipes.coopcloud.tech/mailu) |
|
||||
| mastodon | 3 | A free, open-source social network server | [https://recipes.coopcloud.tech/mastodon](https://recipes.coopcloud.tech/mastodon) |
|
||||
| matrix-synapse | 3 | A Matrix homeserver written in Python | [https://recipes.coopcloud.tech/matrix-synapse](https://recipes.coopcloud.tech/matrix-synapse) |
|
||||
| matomo | 3 | A Google Analytics alternative that protects your data and your customers' privacy | [https://recipes.coopcloud.tech/matomo](https://recipes.coopcloud.tech/matomo) |
|
||||
| mattermost | 3 | Secure collaboration platform | [https://recipes.coopcloud.tech/mattermost](https://recipes.coopcloud.tech/mattermost) |
|
||||
| mattermost-lts | 3 | Long-term support for Mattermost | [https://recipes.coopcloud.tech/mattermost-lts](https://recipes.coopcloud.tech/mattermost-lts) |
|
||||
@@ -115,6 +116,7 @@
|
||||
| nextcloud | 5 | A safe home for all your data | [https://recipes.coopcloud.tech/nextcloud](https://recipes.coopcloud.tech/nextcloud) |
|
||||
| nitter | 3 | An alternative Twitter front-end | [https://recipes.coopcloud.tech/nitter](https://recipes.coopcloud.tech/nitter) |
|
||||
| nocodb | 3 | An open source Airtable alternative | [https://recipes.coopcloud.tech/nocodb](https://recipes.coopcloud.tech/nocodb) |
|
||||
| node-red | 3 | Low-code programming for event-driven applications | [https://recipes.coopcloud.tech/node-red](https://recipes.coopcloud.tech/node-red) |
|
||||
| notea | 3 | A self-hosted note-taking app | [https://recipes.coopcloud.tech/notea](https://recipes.coopcloud.tech/notea) |
|
||||
| ntfy | 3 | A simple HTTP-based pub-sub notification service | [https://recipes.coopcloud.tech/ntfy](https://recipes.coopcloud.tech/ntfy) |
|
||||
| oasis | 3 | A tool for building and managing online communities | [https://recipes.coopcloud.tech/oasis](https://recipes.coopcloud.tech/oasis) |
|
||||
@@ -71,7 +71,7 @@
|
||||
## Getting Started Commands
|
||||
|
||||
```bash
|
||||
# WiFi connects automatically - no manual setup needed!
|
||||
# WiFi connects automatically to CODE_CRISPIES or APSFreeWiFi - no manual setup needed!
|
||||
# Set up your local environment
|
||||
setup
|
||||
|
||||
@@ -120,7 +120,8 @@ Name: Android, Password: (ask facilitator)
|
||||
→ Note: Terminal no longer auto-starts to prevent boot hangs
|
||||
|
||||
**Can't connect to internet**
|
||||
→ WiFi should connect automatically to "CODE_CRISPIES"
|
||||
→ WiFi should connect automatically to "CODE_CRISPIES" or "APSFreeWiFi"
|
||||
→ If connecting to APSFreeWiFi, complete browser login when prompted
|
||||
→ If not, use mobile hotspot as backup
|
||||
→ Check: nmcli connection show --active
|
||||
|
||||
|
||||
Reference in New Issue
Block a user