☺

Update deployment documentation

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!19

.gitlab-ci.yml

@@ -25,5 +25,4 @@ deploy:
     paths:
       - public
   only:
-    - master
     - tags

CHANGELOG.md

@@ -1,9 +1,24 @@
 # Change Log
+
 All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].
 
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: http://semver.org/spec/v2.0.0.html
 
+## [1.0.2] - 2017-11-05
+
+## Added
+- [#18]: Add shared account email.
+
+[#18]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/18
+
+## [1.0.1] - 2017-10-14
+
+## Added
+- [#17]: Added automated Gitlab CI production builds.
+
+[#17]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/17
+
 ## [1.0.0] - 2017-10-04
 - Initial Release

Makefile

@@ -1,18 +1,6 @@
 DEV_DIST_DIR:=dist
-PROD_DIST_DIR:=proddist
-PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git
-PROD_BRANCH:=production
 
 devserver:
 	@echo "Serving development site from $(DEV_DIST_DIR)"
 	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
 .PHONY: devserver
-
-release:
-	@echo "Building production site into $(PROD_DIST_DIR)"
-	@jekyll build --destination $(PROD_DIST_DIR)
-	@echo "Resetting existing production branch"
-	@git push $(PROD_REMOTE) $(PROD_BRANCH) --delete
-	@echo "Pushing latest $(PROD_DIST_DIR) contents to the upstream production branch"
-	@git subtree push --prefix $(PROD_DIST_DIR) $(PROD_REMOTE) $(PROD_BRANCH)
-.PHONY: release

README.md

@@ -21,15 +21,39 @@ Please see [CONTRIBUTING.md] for the juicy details.
 
 # Make A New Release
 
-Firstly, you'll need to tag and push the latest HEAD with:
+Please add a new [change log] entry. This helps us track released changes easily.
+
+[change log]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CHANGELOG.md
+
+Then, [tag a new commit] and send it upstream with:
+
+[tag a new commit]: https://git-scm.com/book/en/v2/Git-Basics-Tagging
+[semantic versioning]: http://semver.org/
 
 ```bash
-$ git tag -a <YOUR-VERSION-NUMBER> $(git rev-parse HEAD)
+$ COMMIT=$(git rev-parse HEAD)
+$ TAG=6.6.6  # enter your new tag
+$ git tag -a $TAG $COMMIT
 $ git push upstream master --tags
 ```
 
-Then make a release with:
+You can also use the [Gitlab tags UI] for this.
+
+[Gitlab tags UI]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tags
+
+Our [deploy] CI stage will push the new site to [the production branch].
+
+[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17
+[the production branch]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tree/production
+
+Watch the [CI/CD pipeline] to see that it builds successfully.
+
+[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines
+
+Then head over to [fullyautomatedluxuryinfrastructure] and run:
+
+[fullyautomatedluxuryinfrastructure]: https://gitlab.com/autonomic-cooperative/fullyautomatedluxuryinfrastructure
 
 ``` bash
-$ make release
+$ ansible-playbook orgs/autonomic/gitlabpages.yml
 ```

bin/deploy

@@ -21,7 +21,6 @@ eval "$(ssh-agent -s)"
 ssh-add <(echo "$SSH_PRIVATE_KEY")
 echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
 
-# ./deploy.sh -m "Git tag: $(git describe --exact-match HEAD)"
+./deploy.sh -m "Git tag: $(git describe --exact-match HEAD)"
-./deploy.sh -m "Hello, World!"
 
 rm -Rfv .ssh

src/_includes/contact.html

@@ -3,7 +3,7 @@
   <header class="major">
     <h2>Get in Touch</h2>
     <p>Contact us to discuss your project's needs and arrange a consultation.</p>
-    <p><a href="mailto:autonomic@posteo.net">autonomic@posteo.net</a></p>
+    <p><a href="mailto:autonomic-coop@posteo.net">autonomic-coop@posteo.net</a></p>
     <p>
       If you use encrypted email, here is our <a href="{{ "/assets/pgp/autonomic-key.asc" | relative_url }}">PGP key</a>.
       Our key fingerprint is: <br/><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>

src/_includes/head.html

@@ -7,4 +7,5 @@
   <link rel="stylesheet" href="{{ "/assets/styles/main.css" | relative_url }}" />
   <!--[if lte IE 8]><link rel="stylesheet" href="{{ "/assets/css/ie8.css" | relative_url }}" /><![endif]-->
   <!--[if lte IE 9]><link rel="stylesheet" href="{{ "/assets/css/ie9.css" | relative_url }}" /><![endif]-->
+  <!-- hi -->
 </head>