From 090772fb9f06138eb86c5a8283c2dbb7e09bffaf Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 15 Nov 2020 23:08:36 +0200
Subject: [PATCH] Updates for GitLab.
Replace links from the old cgit instance to the new GitLab instance.
---
.gitmodules | 2 +-
README.md | 2 +-
content/ansible-example-role.rst | 2 +-
content/ansible-modules.rst | 4 ++--
content/bundle_certs.rst | 19 ++++++++++---------
content/git_serve.rst | 2 +-
content/pages/about.rst | 5 +++--
content/pelican.rst | 2 +-
content/pre-commit.rst | 6 +++---
content/shell_binary_bundle.rst | 6 +++---
content/spam_me.rst | 12 ++++++------
content/why-no-blogging.rst | 2 +-
pelicanconf.py | 2 +-
13 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index a0a5aff..038aad3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "pelican-mockingbird"]
path = pelican-mockingbird
- url = https://www.shore.co.il/git/pelican-mockingbird
+ url = https://git.shore.co.il/nimrod/pelican-mockingbird.git
diff --git a/README.md b/README.md
index 87a10f4..b36a00f 100644
--- a/README.md
+++ b/README.md
@@ -46,4 +46,4 @@ International license](https://creativecommons.org/licenses/by/4.0/).
Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website](
https://www.shore.co.il/). Patches are welcome via [`git send-email`](
http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located
-at: <https://www.shore.co.il/git/>.
+at: <https://git.shore.co.il/>.
diff --git a/content/ansible-example-role.rst b/content/ansible-example-role.rst
index cb08816..bde1d31 100644
--- a/content/ansible-example-role.rst
+++ b/content/ansible-example-role.rst
@@ -95,7 +95,7 @@ it:
.. code:: shell
- git clone https://www.shore.co.il/git/ansible-role-example ansible-role-name
+ git clone https://git.shore.co.il/ansible/ansible-role-example.git ansible-role-name
cd ansible-role-name
for file in $(git grep -l ansible-role-example); do sed -i 's/ansible-role-example/ansible-role-name/g' $file; done
git add .
diff --git a/content/ansible-modules.rst b/content/ansible-modules.rst
index b360eba..43e30b2 100644
--- a/content/ansible-modules.rst
+++ b/content/ansible-modules.rst
@@ -47,5 +47,5 @@ Really, not that complicated. The only magic (undocumented) bit is creating a
:code:`__init__.py` file inside the :code:`library` directory, which is a
shame that the Ansible documentation doesn't cover that. If you want to see a
real-life example, checkout my `ansible-playbooks
-<https://www.shore.co.il/cgit/ansible-playbooks>`_ and `ansible-modules
-<https://www.shore.co.il/cgit/ansible-modules>`_ git repos.
+<https://git.shore.co.il/ansible/ansible-playbooks.git>`_ and `ansible-modules
+<https://git.shore.co.il/ansible/ansible-modules.git>`_ git repos.
diff --git a/content/bundle_certs.rst b/content/bundle_certs.rst
index 835616b..11d51a2 100644
--- a/content/bundle_certs.rst
+++ b/content/bundle_certs.rst
@@ -6,20 +6,21 @@ bundle_certs
Like I said in a previous blog post, I rarely blog but I run :code:`git init
project-name` pretty regularly. So here's a new such repo, `bundle_certs
-<https://www.shore.co.il/cgit/bundle_certs/>`_. A simple shell script for
+<https://git.shore.co.il/nimrod/bundle_certs.git>`_. A simple shell script for
bundling (in the correct order) SSL certificates.
How I start new projects
------------------------
-This little tool, along with `ssl-ca <https://www.shore.co.il/cgit/ssl-ca/>`_
-and `ssh-ca <https://www.shore.co.il/cgit/ssh-ca/>`_ have some commonality in
-how I use them and this seems like a good opportunity to share. I keep my rc
-files (like :code:`.vimrc`) in the
-`rcfiles <https://www.shore.co.il/cgit/rcfiles/`>_ repo. However I don't install
-them as mentioned in the documentation. Instead I add them as Git sub modules
-and now I can be reasonably sure that when I clone the rcfiles repository, the
-aliases and sourced files mentioned in :code:`.bashrc` are present. Here's how:
+This little tool, along with `ssl-ca
+<https://git.shore.co.il/nimrod/ssl-ca.git>`_ and `ssh-ca
+<https://git.shore.co.il/nimrod/ssh-ca.git>`_ have some commonality in how I use
+them and this seems like a good opportunity to share. I keep my rc files (like
+:code:`.vimrc`) in the `rcfiles repo
+<https://git.shore.co.il/nimrod/rcfiles.git`>_. However I don't install them as
+mentioned in the documentation. Instead I add them as Git sub modules and now I
+can be reasonably sure that when I clone the rcfiles repository, the aliases and
+sourced files mentioned in :code:`.bashrc` are present. Here's how:
.. code:: shell
diff --git a/content/git_serve.rst b/content/git_serve.rst
index 67a44d5..b4087ba 100644
--- a/content/git_serve.rst
+++ b/content/git_serve.rst
@@ -51,4 +51,4 @@ Final words
-----------
I've added both ways as git aliases in my `rcfiles repo
-<https://www.shore.co.il/cgit/rcfiles/tree/.gitconfig>`_.
+<https://git.shore.co.il/nimrod/rcfiles/-/blob/master/.config/git/config>`_.
diff --git a/content/pages/about.rst b/content/pages/about.rst
index 6f1c5b5..b5f9e2a 100644
--- a/content/pages/about.rst
+++ b/content/pages/about.rst
@@ -18,7 +18,8 @@ opensource software.
you can contact me at `nimrod@shore.co.il <mailto: nimrod@shore.co.il>`_ or at
`052-8713696 <tel:0528713696>`_ (`+972-52-871-3696 <tel:+972528713696>`_ outside
-of Israel).
+of Israel) or send me a message directly at `shore.co.il/spam
+<https://www.shore.co.il/spam>`_.
Résumé
------
@@ -30,7 +31,7 @@ My résumé is available online in the following formats:
- `PDF <https://www.shore.co.il/resume/resume.pdf>`_
- `Microsoft Word docx <https://www.shore.co.il/resume/resume.docx>`_
-There's also a `repository <https://www.shore.co.il/cgit/resume/about>`_ that
+There's also a `repository <https://git.shore.co.il/nimrod/resume/>`_ that
contains the original reStructuredText version and publishing pipeline.
Last thing, my public `GPG public key <{static}/static/nimrod.asc>`_
diff --git a/content/pelican.rst b/content/pelican.rst
index f56f9f6..3cd15d2 100644
--- a/content/pelican.rst
+++ b/content/pelican.rst
@@ -117,4 +117,4 @@ After we added the content we want to upload it to our web server (I use fabric)
If you don't have keys set for the server it will ask you for your password to the server.
Last thing, you can create pages, create a pages directory inside contents and save the files there. Their format is the same as articles but they'll have a somewhat template applied and they will be shown in the menu. A good example will an 'About Me' page.
-That's it, you now have Pelican installed, configured and published to your web site. If you want to see a real life example, clone `my blog <https://www.shore.co.il/cgit/blog>`_.
+That's it, you now have Pelican installed, configured and published to your web site. If you want to see a real life example, clone `my blog <https://git.shore.co.il/nimrod/blog>`_.
diff --git a/content/pre-commit.rst b/content/pre-commit.rst
index 3037c1e..6525fcd 100644
--- a/content/pre-commit.rst
+++ b/content/pre-commit.rst
@@ -7,9 +7,9 @@ Pre-commit hooks
hooks to your project. The primary goal is running fast checks on commits
(before committing them), mainly linters and syntax checkers. Today I've 2 of my
own, for Ansible playbooks and shell scripts. The Ansible playbooks hook is
-located at https://www.shore.co.il/git/ansible-pre-commit/ and the shell scripts
-hook is at https://www.shore.co.il/git/shell-pre-commit/. Both have a short
-README which describes installation and usage.
+located at https://git.shore.co.il/ansible/ansible-pre-commit.git and the shell
+scripts hook is at https://git.shore.co.il/nimrod/shell-pre-commit.git. Both
+have a short README which describes installation and usage.
My view on testing
------------------
diff --git a/content/shell_binary_bundle.rst b/content/shell_binary_bundle.rst
index e7cdb51..4219672 100644
--- a/content/shell_binary_bundle.rst
+++ b/content/shell_binary_bundle.rst
@@ -41,8 +41,8 @@ Which is fine. However the code was a bit longer than it should have been and
I felt it could be done better. A little more research and I found an answer in
`Stack Overflow <https://stackoverflow.com/a/10491738>`_ that mentioned
:code:`uuencode` and :code:`uudecode`. Reading the man page I saw it was closer
-to what I wanted. The code I wrote is available on my `cgit instance
-<https://www.shore.co.il/git/bundle/about/?id=first_implementation>`_.
+to what I wanted. The code I wrote is available on my `GitLab instance
+<https://git.shore.co.il/nimrod/bundle/-/tree/first_implementation>`_.
The implementation works as follows. The bundle has the script at the start of
the file with the encoded binary at the end. The shell executes the script part
@@ -71,7 +71,7 @@ Everything I found assumed that the file was present in the file system for
:code:`uudecode` to decode. If it was piped there was no file that
:code:`uudecode` could then decode. I kept mauling over it and a came up with
a short, clean solution to this problem, which is available `here
-<https://www.shore.co.il/git/bundle/about/?id=second_implementation>`_, again
+<https://git.shore.co.il/nimrod/bundle/-/tree/second_implementation>`_, again
with build instruction and test examples.
This time I used AWK to replace a single line in the script with the file,
diff --git a/content/spam_me.rst b/content/spam_me.rst
index c5f1f29..b45612b 100644
--- a/content/spam_me.rst
+++ b/content/spam_me.rst
@@ -7,19 +7,19 @@ Spam me
A while back I saw an interesting project, `Patchbay <https://patchbay.pub/>`_.
At first I wanted to use it when I run long tasks on remote machines (as the
example shows). I would obviously script the desktop part, commit it to my
-`rcfiles repo <https:/www.shore.co.il/git/rcfiles>`_ and have it run on startup.
-As a security/ privacy concern, I plannedd on keeping the full URL private. So
-I shelved it until I would have a proper secret management system in place for
-such things.
+`rcfiles repo <https:/git.shore.co.il/nimrod/rcfiles.git>`_ and have it run on
+startup. As a security/ privacy concern, I plannedd on keeping the full URL
+private. So I shelved it until I would have a proper secret management system
+in place for such things.
A few months went by and I remembered that project and started to play around
with receiving such messages but sending them from a webpage. The outcome is
`shore.co.il/spam <https://www.shore.co.il/spam>`_. I'm annnouncing this on my
blog as I'm actually interested to see if I get any spam this way. The desktop
side of things is in this `rcfiles commit
-<https://www.shore.co.il/git/rcfiles/commit/?id=b9732647fe865e9fc7c225b26adb6275ee435a94>`_
+<https://git.shore.co.il/nimrod/rcfiles/-/commit/1e912443df1d8066f074a4addb1b443ada9ee36e>`_
and the source for web page is in my `blog commit
-<https://www.shore.co.il/git/blog/commit/?id=b99513ebadc5f39c77d109597804b76b79e5a2c0>`_,
+<https://git.shore.co.il/nimrod/blog/-/commit/b99513ebadc5f39c77d109597804b76b79e5a2c0>`_,
both are quite public.
There isn't something technically interesting here (apart from Patchbay). But
diff --git a/content/why-no-blogging.rst b/content/why-no-blogging.rst
index cd9f543..b9fc40c 100644
--- a/content/why-no-blogging.rst
+++ b/content/why-no-blogging.rst
@@ -24,4 +24,4 @@ signed certificates. The main use case is an internal network (like a
development or staging environment, but not just) where you control all nodes.
For that goal, it's as close to a real CA as needed and somewhat secure. There's
no OCSP or CRL, the certs serial is random, but the default hash, bit length and
-algorithms are modern and secure. You can get it at: https://www.shore.co.il/cgit/ssl-ca/about/.
+algorithms are modern and secure. You can get it at: https://git.shore.co.il/nimrod/ssl-ca/.
diff --git a/pelicanconf.py b/pelicanconf.py
index d683fee..df5f245 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -28,7 +28,7 @@ RELATIVE_URLS = True
DIRECT_TEMPLATES = ('index', 'archives')
DISPLAY_CATEGORIES_ON_MENU = False
DISPLAY_PAGES_ON_MENU = True
-MENUITEMS = (('Code', 'https://www.shore.co.il/git/'),)
+MENUITEMS = (('Code', 'https://git.shore.co.il/nimrod'),)
THEME = "./pelican-mockingbird"
TAGS_SAVE_AS = ''
TAG_SAVE_AS = ''
--
GitLab