From 431c5de20ad0a69cd0739c30fb235c23c26b0134 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Sat, 12 Dec 2020 20:43:03 +0200
Subject: [PATCH] Rename apella to concordia

---
 README.md                                      |  6 +++---
 SETUP.md                                       |  6 +++---
 docker-compose.yml                             | 14 +++++++-------
 env/jenkins.env                                |  6 +++---
 jenkins/Dockerfile                             |  2 +-
 jenkins/configuration/dockerCredentials.groovy |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 141b4f9..7a64288 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Janus
-> A Dockerized Jenkins CI-CD system for Apella
+> A Dockerized Jenkins CI-CD system for Concordia
 
 Janus is a Docker image that contains an instance of Jenkins with all the necessary configuration built into it for
-handling the CI-CD of Apella.
+handling the CI-CD of Concordia.
 
 ## Prerequisites
 
@@ -38,7 +38,7 @@ under Global Credentials.
 
 Lastly a Webhook must be added to Gitlab, pointing to the Jenkins project. On Gitlab, navigate to the Webhooks menu in
 the Settings of the project and add a new webhook pointing to
-`https://jenkins.apella.tk/project/staging-apella-multibranch-pipeline`.
+`https://jenkins.concordia.tk/project/staging-concordia-multibranch-pipeline`.
 
 To get the git branches and Jenkinsfiles from each branch initiate a `Multibranch Pipeline Scan`.
 
diff --git a/SETUP.md b/SETUP.md
index 06b0af4..48c18b9 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,6 +1,6 @@
 # Installation
 
-Welcome to **Janus** installation guide (the Jenkins based CI-CD systyem for Apella).
+Welcome to **Janus** installation guide (the Jenkins based CI-CD systyem for Concordia).
 
 **This installation guide is intended for computers using Debian based, Linux distributions!**
 
@@ -11,7 +11,7 @@ Although the guide is pretty detailed don't hesitate to open an issue or contact
 
 ## Introduction
 
-Janus is a docker image based on the official Jenkins image. Its purpose is to be used as a CI-CD system for Apella,
+Janus is a docker image based on the official Jenkins image. Its purpose is to be used as a CI-CD system for Concordia,
 but can be easily modified for use with any project, especially decentralized apps using the truffle suite.
 
 ## Prerequisites
@@ -68,7 +68,7 @@ for convenience:
 
 ### Jobs added
 
-A number of jobs (specific to Apella) are automatically configured. The config XML files are located in the directory
+A number of jobs (specific to Concordia) are automatically configured. The config XML files are located in the directory
 `jenkins/jobs`.
 
 ## Uninstalling
diff --git a/docker-compose.yml b/docker-compose.yml
index db5f0fb..6f80cbb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
         max-size: '4m'
         max-file: '10'
     networks:
-      - jenkins-net
-      - apella-net
+      - jenkins_net
+      - concordia_net
     ports:
       - "80:80"
       - "443:443"
@@ -43,8 +43,8 @@ services:
         max-size: '4m'
         max-file: '10'
     networks:
-      - jenkins-net
-      - apella-net
+      - jenkins_net
+      - concordia_net
     volumes:
       - ./volumes/nginx/conf:/etc/nginx/conf.d
       - ./volumes/nginx/vhost:/etc/nginx/vhost.d
@@ -71,7 +71,7 @@ services:
       - jenkins_dockerhub_username
       - jenkins_dockerhub_password
     networks:
-      - jenkins-net
+      - jenkins_net
     volumes:
       - ./volumes/jenkins/log:/var/log/jenkins
       - jenkins-data:/var/jenkins_home
@@ -81,9 +81,9 @@ services:
 # Networks in use
 # TODO: maybe add/split to separate networks
 networks:
-  jenkins-net:
+  jenkins_net:
     driver: bridge
-  apella-net:
+  concordia_net:
     driver: bridge
 # Secrets in use
 secrets:
diff --git a/env/jenkins.env b/env/jenkins.env
index e0662d2..9da6e74 100644
--- a/env/jenkins.env
+++ b/env/jenkins.env
@@ -1,5 +1,5 @@
-VIRTUAL_HOST=jenkins.apella.tk
+VIRTUAL_HOST=jenkins.concordia.tk
 VIRTUAL_PORT=8080
-LETSENCRYPT_HOST=jenkins.apella.tk
+LETSENCRYPT_HOST=jenkins.concordia.tk
 LETSENCRYPT_EMAIL=ecentricsgr@gmail.com
-JENKINS_URL=https://jenkins.apella.tk/
+JENKINS_URL=https://jenkins.concordia.tk/
diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
index 238c6c5..63727b8 100644
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -41,7 +41,7 @@ COPY configuration/* /var/jenkins_home/init.groovy.d/
 COPY plugins.txt /usr/share/jenkins/ref/plugins.txt
 RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt
 
-# Adds job configurations for apella
+# Adds job configurations for concordia
 COPY jobs/. /var/jenkins_home/jobs/
 
 # Sets defaults
diff --git a/jenkins/configuration/dockerCredentials.groovy b/jenkins/configuration/dockerCredentials.groovy
index 268d370..39468b6 100644
--- a/jenkins/configuration/dockerCredentials.groovy
+++ b/jenkins/configuration/dockerCredentials.groovy
@@ -11,8 +11,8 @@ def dockerhubUser = new File("/run/secrets/jenkins_dockerhub_username").text.tri
 def dockerhubPassword = new File("/run/secrets/jenkins_dockerhub_password").text.trim()
 
 def jenkinsKeyUsernameWithPasswordParameters = [
-        description: 'Apella docker-hub',
-        id         : 'docker-hub-apella',
+        description: 'Concordia docker-hub',
+        id         : 'docker-hub-concordia',
         password   : dockerhubPassword,
         userName   : dockerhubUser
 ]