all: rename _play, _ops/awwan-play to _tour, _ops/awwan-tour

The name "play" imply that the service is to run awwan script, while
the "tour" is to guide the new user to use awwan WUI, since its contains
the tutorial.

52 files changed, 31 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index 62d8336..60e7b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 /_mkosi/image.raw
 /_mkosi/mkosi.builddir/
 /_mkosi/mkosi.cache/
+/_tour/output
 /_wui/doc/*.html
 /awwan
 /awwan.test
diff --git a/Makefile b/Makefile
index 475567a..86e1925 100644
--- a/Makefile
+++ b/Makefile
@@ -158,24 +158,26 @@ release-sync-local:
 release-tip-local: embed build-all-amd64 build-all-arm64 release-sync-local
 
 #}}}
-#{{{ Tasks for play.awwan.org.
+#{{{ Tasks for tour.awwan.org.
 
-## Build the play.awwan.org container in local.
+## Build the tour.awwan.org container in local.
 
-.PHONY: build-awwan-play
-build-awwan-play:
+.PHONY: build-tour
+build-tour:
+	@echo ">>> Building container ..."
+	sudo mkosi --directory=_ops/awwan-tour --force build
+
+.PHONY: build-tour-local
+build-tour-local: build-tour
 	@echo ">>> Stopping container ..."
-	-sudo machinectl stop awwan-play
+	-sudo machinectl stop awwan-tour
 
+	## We need to bind src/_bin and src/_tour into container.
 	@echo ">>> Creating binding ..."
-	## We need to bind src/_bin and src/_play into container.
 	mkdir -p /data/awwan/
 	ln -sTf $$(pwd) /data/awwan/src
 
-	@echo ">>> Building container ..."
-	sudo mkosi --directory=_ops/awwan-play --force build
-
-	sudo machinectl --force import-tar /data/awwan/awwan-play.tar
-	sudo machinectl start awwan-play
+	sudo machinectl --force import-tar /data/awwan/awwan-tour.tar
+	sudo machinectl start awwan-tour
 
 #}}}
diff --git a/_ops/awwan-play/mkosi.conf b/_ops/awwan-tour/mkosi.conf
index 11a9dc7..2372acb 100644
--- a/_ops/awwan-play/mkosi.conf
+++ b/_ops/awwan-tour/mkosi.conf
@@ -1,7 +1,7 @@
 [Output]
 CacheDirectory=../mkosi.cache/
 Format=tar
-Output=awwan-play
+Output=awwan-tour
 OutputDirectory=/data/awwan/
 
 [Content]
diff --git a/_ops/awwan-play/mkosi.conf.d/archlinux.conf b/_ops/awwan-tour/mkosi.conf.d/archlinux.conf
index 34add3f..34add3f 100644
--- a/_ops/awwan-play/mkosi.conf.d/archlinux.conf
+++ b/_ops/awwan-tour/mkosi.conf.d/archlinux.conf
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ecdsa_key b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ecdsa_key
index 4c84aa4..4c84aa4 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ecdsa_key
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ecdsa_key
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ecdsa_key.pub b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ecdsa_key.pub
index 268f2e6..268f2e6 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ecdsa_key.pub
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ecdsa_key.pub
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ed25519_key b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ed25519_key
index 5613dbc..5613dbc 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ed25519_key
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ed25519_key
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ed25519_key.pub b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ed25519_key.pub
index 4b588a3..4b588a3 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_ed25519_key.pub
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_ed25519_key.pub
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_rsa_key b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_rsa_key
index 3cd073e..3cd073e 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_rsa_key
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_rsa_key
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_rsa_key.pub b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_rsa_key.pub
index 9c58598..9c58598 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/ssh_host_rsa_key.pub
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/ssh_host_rsa_key.pub
diff --git a/_ops/awwan-play/mkosi.extra/etc/ssh/sshd_config b/_ops/awwan-tour/mkosi.extra/etc/ssh/sshd_config
index 2c12987..2c12987 100644
--- a/_ops/awwan-play/mkosi.extra/etc/ssh/sshd_config
+++ b/_ops/awwan-tour/mkosi.extra/etc/ssh/sshd_config
diff --git a/_ops/awwan-play/mkosi.extra/etc/sudoers.d/awwan b/_ops/awwan-tour/mkosi.extra/etc/sudoers.d/awwan
index 7288bf3..7288bf3 100644
--- a/_ops/awwan-play/mkosi.extra/etc/sudoers.d/awwan
+++ b/_ops/awwan-tour/mkosi.extra/etc/sudoers.d/awwan
diff --git a/_ops/awwan-play/mkosi.extra/etc/systemd/system/org-awwan-play.path b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/org-awwan-tour.path
index 523289f..523289f 100644
--- a/_ops/awwan-play/mkosi.extra/etc/systemd/system/org-awwan-play.path
+++ b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/org-awwan-tour.path
diff --git a/_ops/awwan-play/mkosi.extra/etc/systemd/system/org-awwan-play.service b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/org-awwan-tour.service
index 1797de0..052a68c 100644
--- a/_ops/awwan-play/mkosi.extra/etc/systemd/system/org-awwan-play.service
+++ b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/org-awwan-tour.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=org-awwan-play
+Description=org-awwan-tour
 After=network-online.target
 
 [Service]
 User=awwan
-WorkingDirectory=/home/awwan/play
+WorkingDirectory=/home/awwan/tour
 ExecStart=/usr/local/bin/awwan -address=0.0.0.0:27600 \
-  serve /home/awwan/play
+  serve /home/awwan/tour
 Restart=always
 RestartSec=5s
 
diff --git a/_ops/awwan-play/mkosi.extra/etc/systemd/system/systemctl-restart@.service b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/systemctl-restart@.service
index 800316e..800316e 100644
--- a/_ops/awwan-play/mkosi.extra/etc/systemd/system/systemctl-restart@.service
+++ b/_ops/awwan-tour/mkosi.extra/etc/systemd/system/systemctl-restart@.service
diff --git a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/id_ed25519 b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/id_ed25519
index b55b87f..b55b87f 100644
--- a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/id_ed25519
+++ b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/id_ed25519
diff --git a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/id_ed25519.pub b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/id_ed25519.pub
index 6b83dfd..6b83dfd 100644
--- a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/id_ed25519.pub
+++ b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/id_ed25519.pub
diff --git a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/known_hosts b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/known_hosts
index 5611175..5611175 100644
--- a/_ops/awwan-play/mkosi.extra/home/awwan/.ssh/known_hosts
+++ b/_ops/awwan-tour/mkosi.extra/home/awwan/.ssh/known_hosts
diff --git a/_ops/awwan-play/mkosi.extra/home/awwan/play/.gitignore b/_ops/awwan-tour/mkosi.extra/home/awwan/tour/.gitignore
index 120f485..120f485 100644
--- a/_ops/awwan-play/mkosi.extra/home/awwan/play/.gitignore
+++ b/_ops/awwan-tour/mkosi.extra/home/awwan/tour/.gitignore
diff --git a/_ops/awwan-play/mkosi.extra/home/awwanssh/.ssh/authorized_keys b/_ops/awwan-tour/mkosi.extra/home/awwanssh/.ssh/authorized_keys
index 6b83dfd..6b83dfd 100644
--- a/_ops/awwan-play/mkosi.extra/home/awwanssh/.ssh/authorized_keys
+++ b/_ops/awwan-tour/mkosi.extra/home/awwanssh/.ssh/authorized_keys
diff --git a/_ops/awwan-play/mkosi.finalize.chroot b/_ops/awwan-tour/mkosi.finalize.chroot
index a3db830..ed11077 100755
--- a/_ops/awwan-play/mkosi.finalize.chroot
+++ b/_ops/awwan-tour/mkosi.finalize.chroot
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 systemctl enable sshd.service
-systemctl enable org-awwan-play.path
-systemctl enable org-awwan-play.service
+systemctl enable org-awwan-tour.path
+systemctl enable org-awwan-tour.service
 
 chmod 0600 /etc/ssh/*_key
 chown -R awwan:awwan /home/awwan/
diff --git a/_ops/awwan-play/mkosi.nspawn b/_ops/awwan-tour/mkosi.nspawn
index 95a301e..b542102 100644
--- a/_ops/awwan-play/mkosi.nspawn
+++ b/_ops/awwan-tour/mkosi.nspawn
@@ -3,7 +3,7 @@ Ephemeral=yes
 LinkJournal=no
 
 [Files]
-Bind=/data/awwan/src/_play:/home/awwan/play:idmap
+Bind=/data/awwan/src/_tour:/home/awwan/tour:idmap
 Bind=/data/awwan/src/_bin:/usr/local/bin
 
 [Network]
diff --git a/_ops/awwan-play/mkosi.prepare.chroot b/_ops/awwan-tour/mkosi.prepare.chroot
index ee0cf8e..ee0cf8e 100755
--- a/_ops/awwan-play/mkosi.prepare.chroot
+++ b/_ops/awwan-tour/mkosi.prepare.chroot
diff --git a/_ops/awwan-play/mkosi.skeleton/etc/pacman.conf b/_ops/awwan-tour/mkosi.skeleton/etc/pacman.conf
index e288913..e288913 100644
--- a/_ops/awwan-play/mkosi.skeleton/etc/pacman.conf
+++ b/_ops/awwan-tour/mkosi.skeleton/etc/pacman.conf
diff --git a/_play/.awwan.env b/_tour/.awwan.env
index 66b8f20..66b8f20 100644
--- a/_play/.awwan.env
+++ b/_tour/.awwan.env
diff --git a/_play/.awwan.env.vault b/_tour/.awwan.env.vault
index 15fb80b..15fb80b 100644
--- a/_play/.awwan.env.vault
+++ b/_tour/.awwan.env.vault
diff --git a/_play/.gitignore b/_tour/.gitignore
index 12f8d5f..12f8d5f 100644
--- a/_play/.gitignore
+++ b/_tour/.gitignore
diff --git a/_play/.ssh/awwan.key b/_tour/.ssh/awwan.key
index 7ff257d..7ff257d 100644
--- a/_play/.ssh/awwan.key
+++ b/_tour/.ssh/awwan.key
diff --git a/_play/.ssh/awwan.pass b/_tour/.ssh/awwan.pass
index 55b8390..55b8390 100644
--- a/_play/.ssh/awwan.pass
+++ b/_tour/.ssh/awwan.pass
diff --git a/_play/.ssh/config b/_tour/.ssh/config
index fba1de1..fba1de1 100644
--- a/_play/.ssh/config
+++ b/_tour/.ssh/config
diff --git a/_play/.vimrc b/_tour/.vimrc
index 0b527fd..0b527fd 100644
--- a/_play/.vimrc
+++ b/_tour/.vimrc
diff --git a/_play/00_README.txt b/_tour/00_README.txt
index 48d6ee6..316ca97 100644
--- a/_play/00_README.txt
+++ b/_tour/00_README.txt
@@ -1,34 +1,36 @@
 = Welcome to awwan
 
 This is an example of awwan workspace.
+
 The awwan workspace is indicated by ".ssh" directory, as you can see in the
 list of file in the left.
 
 In awwan, every file is a script, including this file.
-As long as the line is a valid shell command it can execute it.
+As long as the line is a valid shell command, awwan can execute it.
 
 Lets try.
 
 echo "Hello world" > {{.ScriptDir}}/output
 
-In the input "Execute line" below, set its value to "12" and click on the
+In the input "Execute line" below, set its value to "13" and click on the
 "Local" button.
 You should see output like these,
 
-  2023/11/29 15:45:08 -->  12: echo "Hello world" > /home/awwan/workspace/output
+  2023/11/29 15:45:08 -->  13: echo "Hello world" > /home/awwan/tour/output
 
 The same line can be executed in terminal using awwan CLI with following
 command,
 
-awwan local README.txt 12
+awwan local {{.ScriptDir}}/00_README.txt 13
 
 Click on the directory path "/" on the left top (above ".ssh"), to refresh
 the content of directory.
-You should see a new file "output" (and "README.txt.log") in the list after
+You should see a new file "output" and "00_README.txt.log" in the list after
 executing above line.
-You ca click on the file "output" to see its content.
+Click on the file "output" to see its content or execute the line below
+
+cat {{.ScriptDir}}/output
 
-That's it!
 
 We provides an example files to follow along, that explain each command and
 feature in the awwan.
diff --git a/_play/01_local.aww b/_tour/01_local.aww
index 3ec57b1..3ec57b1 100644
--- a/_play/01_local.aww
+++ b/_tour/01_local.aww
diff --git a/_play/02_script_variables.aww b/_tour/02_script_variables.aww
index 44b1192..44b1192 100644
--- a/_play/02_script_variables.aww
+++ b/_tour/02_script_variables.aww
diff --git a/_play/03_env.aww b/_tour/03_env.aww
index 56c5574..56c5574 100644
--- a/_play/03_env.aww
+++ b/_tour/03_env.aww
diff --git a/_play/04_env-set.aww b/_tour/04_env-set.aww
index bc74b20..bc74b20 100644
--- a/_play/04_env-set.aww
+++ b/_tour/04_env-set.aww
diff --git a/_play/05_env-get.aww b/_tour/05_env-get.aww
index 33352b4..33352b4 100644
--- a/_play/05_env-get.aww
+++ b/_tour/05_env-get.aww
diff --git a/_play/06_magic_put.aww b/_tour/06_magic_put.aww
index bf6f0e7..bf6f0e7 100644
--- a/_play/06_magic_put.aww
+++ b/_tour/06_magic_put.aww
diff --git a/_play/07_magic_get.aww b/_tour/07_magic_get.aww
index 6429401..6429401 100644
--- a/_play/07_magic_get.aww
+++ b/_tour/07_magic_get.aww
diff --git a/_play/08_encrypt.aww b/_tour/08_encrypt.aww
index a32fd0f..a32fd0f 100644
--- a/_play/08_encrypt.aww
+++ b/_tour/08_encrypt.aww
diff --git a/_play/09_decrypt.aww b/_tour/09_decrypt.aww
index 3777e47..72958f9 100644
--- a/_play/09_decrypt.aww
+++ b/_tour/09_decrypt.aww
@@ -10,7 +10,7 @@ Lets try decrypting the previous file that we encrypt,
 
   awwan decrypt secret.txt.vault
 
-Execute the above line and tt will decrypt the file into "secret.txt",
+Execute the above line and it will decrypt the file into "secret.txt",
 
   2023/12/06 15:09:55 -->  11: awwan decrypt secret.txt.vault
   2023/12/06 15:09:55 --- BaseDir: /home/awwan/play
diff --git a/_play/10_encrypted_env.aww b/_tour/10_encrypted_env.aww
index 9710812..9710812 100644
--- a/_play/10_encrypted_env.aww
+++ b/_tour/10_encrypted_env.aww
diff --git a/_play/11_encrypted_put.aww b/_tour/11_encrypted_put.aww
index ceb5372..ceb5372 100644
--- a/_play/11_encrypted_put.aww
+++ b/_tour/11_encrypted_put.aww
diff --git a/_play/12_magic_require.aww b/_tour/12_magic_require.aww
index e98361e..e98361e 100644
--- a/_play/12_magic_require.aww
+++ b/_tour/12_magic_require.aww
diff --git a/_play/app.conf.vault b/_tour/app.conf.vault
index 9032d84..9032d84 100644
--- a/_play/app.conf.vault
+++ b/_tour/app.conf.vault
diff --git a/_play/awwan.env b/_tour/awwan.env
index 97b1383..97b1383 100644
--- a/_play/awwan.env
+++ b/_tour/awwan.env
diff --git a/_play/example.aww b/_tour/example.aww
index 0b58478..0b58478 100644
--- a/_play/example.aww
+++ b/_tour/example.aww
diff --git a/_play/put_source.txt b/_tour/put_source.txt
index 5067c47..5067c47 100644
--- a/_play/put_source.txt
+++ b/_tour/put_source.txt
diff --git a/_play/remotehost/01_play.aww b/_tour/remotehost/01_play.aww
index 4384bab..4384bab 100644
--- a/_play/remotehost/01_play.aww
+++ b/_tour/remotehost/01_play.aww
diff --git a/_play/remotehost/02_magic_local.aww b/_tour/remotehost/02_magic_local.aww
index 7fe9fbc..7fe9fbc 100644
--- a/_play/remotehost/02_magic_local.aww
+++ b/_tour/remotehost/02_magic_local.aww
diff --git a/_play/remotehost/awwan.env b/_tour/remotehost/awwan.env
index 62d03d0..62d03d0 100644
--- a/_play/remotehost/awwan.env
+++ b/_tour/remotehost/awwan.env
diff --git a/_play/secret.txt b/_tour/secret.txt
index f9e7103..f9e7103 100644
--- a/_play/secret.txt
+++ b/_tour/secret.txt