switch ottg.eu to ottg.co.uk. a bit in 11

Author: hjwp

appendix_IV_testing_migrations.asciidoc

@@ -34,7 +34,7 @@ constraints in <<chapter_deploying_validation>>:
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*cd deploy_tools*]
-$ pass:quotes[*fab deploy:host=elspeth@superlists-staging.ottg.eu*]
+$ pass:quotes[*fab deploy:[email protected].co.uk*]
 [...]
 Running migrations:
   Applying lists.0005_list_item_unique_together...Traceback (most recent call
@@ -88,8 +88,8 @@ Copy the database down from live:
 
 [subs="specialcharacters,quotes"]
 ----
-$ *scp [email protected].eu:\
-/home/elspeth/sites/superlists.ottg.eu/database/db.sqlite3 .*
+$ *scp [email protected].co.uk:\
+/home/elspeth/sites/superlists.ottg.co.uk/database/db.sqlite3 .*
 $ *mv ../database/db.sqlite3 ../database/db.sqlite3.bak*
 $ *mv db.sqlite3 ../database/db.sqlite3*
 ----
@@ -197,7 +197,7 @@ We're now ready to run our test against the live data:
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*cd deploy_tools*]
-$ pass:quotes[*fab deploy:host=elspeth@superlists-staging.ottg.eu*]
+$ pass:quotes[*fab deploy:[email protected].co.uk*]
 [...]
 ----
 
@@ -206,7 +206,7 @@ We'll need to restart the live Gunicorn job too:
 [role="server-commands skipme"]
 [subs="specialcharacters,quotes"]
 ----
-elspeth@server:$ *sudo systemctl restart gunicorn-superlists.ottg.eu*
+elspeth@server:$ *sudo systemctl restart gunicorn-superlists.ottg.co.uk*
 ----
 
 
@@ -215,7 +215,7 @@ And we can now run our FTs against staging:
 [role="skipme small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*STAGING_SERVER=superlists-staging.ottg.eu python manage.py test functional_tests*]
+$ pass:quotes[*STAGING_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
 [...]
 ....
  ---------------------------------------------------------------------
@@ -231,8 +231,8 @@ Everything seems in order!  Let's do it against live:
 [role="skipme"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*fab deploy:host=superlists.ottg.eu*]
-[superlists.ottg.eu] Executing task 'deploy'
+$ pass:quotes[*fab deploy:host=superlists.ottg.co.uk*]
+[superlists.ottg.co.uk] Executing task 'deploy'
 [...]
 ----
 

chapter_11_ansible.asciidoc

@@ -34,7 +34,6 @@ NOTE: Why not ping me a note once your site is live on the web,
     It always gives me a warm and fuzzy feeling...
     [email protected].
 
-//TODO useful blog post https://linuxhandbook.com/autostart-podman-containers/
 
 
 .🚧 Warning, this chapter is heavily under construction
@@ -58,7 +57,7 @@ But otherwise it might be best to skip ahead to <<chapter_12_organising_test_fil
 ((("domain names")))
 We're going to need a couple of domain names at this point in the book--they
 can both be subdomains of a single domain.  I'm going to use
-_superlists.ottg.eu_ and _superlists-staging.ottg.eu_.
+_superlists.ottg.co.uk_ and _staging.ottg.co.uk_.
 If you don't already own a domain, this is the time to register one!
 Again, this is something I really want you to _actually_ do.
 If you've never registered a domain before,
@@ -76,8 +75,8 @@ I promise seeing your site on a "real" website will be a thrill.
 ((("server provisioning", id="seerver09")))
 We can separate out "deployment" into two tasks:
 
-- 'Provisioning' a new server to be able to host the code
-- 'Deploying' a new version of the code to an existing server
+- _Provisioning_ a new server to be able to host the code
+- _Deploying_ a new version of the code to an existing server
 
 Ultimately, infrastructure-as-code tools can let you automate both of these,
 but for the purposes of this book, we can live with manual provisioning.
@@ -119,10 +118,10 @@ from all the grizzled dinosaurs out there.
 
 ==== Spinning Up a Server
 
-I'm not going to dictate how you do this--whether you choose Amazon AWS,
-Rackspace, Digital Ocean, your own server in your own data centre or a
-Raspberry Pi in a cupboard under the stairs, any solution should be fine,
-as long as:
+I'm not going to dictate how you do this--whether
+you choose Amazon AWS, Rackspace, Digital Ocean, your own server in a data centre,
+or a Raspberry Pi in a cupboard under the stairs,
+any solution should be fine, as long as:
 
 * Your server is running Ubuntu 22.04 (aka "Jammy/LTS").
 
@@ -144,8 +143,9 @@ https://github.com/hjwp/Book-TDD-Web-Dev-Python/blob/master/server-quickstart.md
 
 NOTE: Some people get to this chapter, and are tempted to skip the domain bit,
     and the "getting a real server" bit, and just use a VM on their own PC.
-    Don't do this. It's _not_ the same, and you'll have more difficulty
-    following the instructions, which are complicated enough as it is.
+    Don't do this.
+    It's _not_ the same, and you'll have more difficulty following the instructions,
+    which are complicated enough as it is.
     If you're worried about cost, have a look at the link above for free options.
     ((("getting help")))
 
@@ -205,9 +205,9 @@ DNS records take some time to "propagate" around the world
 (it's controlled by a setting called "TTL", Time To Live),
 so once you've set up your A-record,
 you can check its progress on a "propagation checking" service like this one:
-https://www.whatsmydns.net/#A/superlists-staging.ottg.eu.
+https://www.whatsmydns.net/#A/staging.ottg.co.uk.
 
-I'm planning to host my staging server at 'superlists-staging.ottg.eu':
+I'm planning to host my staging server at 'staging.ottg.co.uk':
 
 
 === A first Cut of an Ansible Script
@@ -253,18 +253,42 @@ TODO: forget podman, just use docker.
 - hosts: all
 
   tasks:
-    - name: Install podman  <1>
-      ansible.builtin.apt:  <2>
-        name: podman  <3>
-        update_cache: yes
-      become: true
 
-    - name: Run container
-      containers.podman.podman_container:
+    - name: Install docker  <1>
+      become: true
+      block:
+      - name: Add Docker GPG apt Key
+        ansible.builtin.apt_key:  <2>
+          url: https://download.docker.com/linux/ubuntu/gpg
+          state: present
+
+      - name: Add Docker Repository
+        ansible.builtin.apt_repository:
+          repo: deb https://download.docker.com/linux/ubuntu jammy stable
+          state: present
+
+      - name: Update apt and install docker-ce
+        ansible.builtin.apt:
+          name: docker-ce
+          state: latest
+          update_cache: true
+
+      - name: Install Docker Module for Python
+        ansible.builtin.pip:
+          name: docker
+
+      - name: Add our user to Docker allowed users
+        ansible.builtin.user:
+          name: elspeth
+          groups: docker
+          append: true
+
+    - name: Run test container
+      community.docker.docker_container:
         name: testcontainer
-        image: busybox
         state: started
-        cmd: echo hello world
+        image: busybox
+        command: echo hello world
 ----
 ====
 
@@ -274,7 +298,7 @@ TODO: forget podman, just use docker.
   Each one usually has a human-readable `name` attribute.
 
 <2> Each tasks uses an ansible "module" to do its work.
-  This one uses the `builtin.apt` module which provides
+  The next few use the `builtin.apt` module which provides
   a wrapper around the `apt` Debian & Ubuntu package management tool.
 
 <3> Each module then provides a bunch of parameters which control
@@ -292,7 +316,7 @@ $ *ansible-playbook --user=elspeth -i 192.168.56.10, infra/ansible-provision.yam
 ----
 
 TODO: show ansible output.
-TODO: stop using local ip 
+TODO: stop using local ip
 
 
 === SSHing Into the Server and Viewing Container Logs
@@ -542,7 +566,7 @@ self-explanatory.
 [role="small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*TEST_SERVER=superlists-staging.ottg.eu python manage.py test functional_tests*]
+$ pass:quotes[*TEST_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
 [...]
 OK
 ----
@@ -601,10 +625,10 @@ So, let's try using it for our live site!
 [role="small-code against-server"]
 [subs=""]
 ----
-$ <strong>fab deploy:[email protected].eu</strong>
+$ <strong>fab deploy:[email protected].co.uk</strong>
 
 Done.
-Disconnecting from [email protected].eu... done.
+Disconnecting from [email protected].co.uk... done.
 ----
 
 

chapter_deploying_validation.asciidoc

@@ -26,25 +26,25 @@ We start with the staging server:
 ----
 $ pass:quotes[*git push*]
 $ pass:quotes[*cd deploy_tools*]
-$ pass:quotes[*fab deploy:host=elspeth@superlists-staging.ottg.eu*]
+$ pass:quotes[*fab deploy:[email protected].co.uk*]
 [...]
-Disconnecting from superlists-staging.ottg.eu... done.
+Disconnecting from staging.ottg.co.uk... done.
 ----
 
 Restart Gunicorn:
 
 [role="server-commands skipme"]
 [subs="specialcharacters,quotes"]
 ----
-elspeth@server:$ *sudo systemctl restart gunicorn-superlists-staging.ottg.eu*
+elspeth@server:$ *sudo systemctl restart gunicorn-staging.ottg.co.uk*
 ----
 
 And run the tests against staging:
 
 [role="small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*STAGING_SERVER=superlists-staging.ottg.eu python manage.py test functional_tests*]
+$ pass:quotes[*STAGING_SERVER=staging.ottg.co.uk python manage.py test functional_tests*]
 OK
 ----
 
@@ -61,13 +61,13 @@ Assuming all is well, we then run our deploy against live:
 [role="against-server"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*fab deploy:[email protected].eu*]
+$ pass:quotes[*fab deploy:[email protected].co.uk*]
 ----
 
 [role="server-commands"]
 [subs="specialcharacters,quotes"]
 ----
-elspeth@server:$ *sudo service gunicorn-superlists.ottg.eu restart*
+elspeth@server:$ *sudo service gunicorn-superlists.ottg.co.uk restart*
 ----