From f85a76318ac2c53e0bd6dc3ddb806d31e1a60f31 Mon Sep 17 00:00:00 2001 From: Clemens Wolff Date: Tue, 28 Apr 2020 23:26:47 -0400 Subject: [PATCH] Rename repo --- .travis.sh | 2 +- .travis.yml | 4 +-- README.rst | 28 +++++++++---------- docker/setup/setup.sh | 2 +- docker/setup/vm.sh | 20 ++++++------- docker/statuspage/Dockerfile | 2 +- helm/opwen_cloudserver/Chart.yaml | 4 +-- install.py | 2 +- makefile | 2 +- .../swagger/client-metrics.yaml | 2 +- opwen_email_server/swagger/client-read.yaml | 2 +- .../swagger/client-register.yaml | 2 +- opwen_email_server/swagger/client-write.yaml | 2 +- opwen_email_server/swagger/email-receive.yaml | 2 +- opwen_email_server/swagger/healthcheck.yaml | 2 +- opwen_statuspage/package.json | 2 +- opwen_statuspage/public/index.html | 2 +- opwen_statuspage/src/Header.js | 2 +- package.json | 2 +- setup.py | 6 ++-- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.travis.sh b/.travis.sh index d54d86a7..4c74da61 100755 --- a/.travis.sh +++ b/.travis.sh @@ -7,7 +7,7 @@ if [[ "$TRAVIS_PULL_REQUEST" = "false" ]] && [[ "$TEST_MODE" = "live" ]]; then exit 0 fi -if [[ "$TRAVIS_PULL_REQUEST_SLUG" != "ascoderu/opwen-cloudserver" ]] && [[ "$TEST_MODE" = "live" ]]; then +if [[ "$TRAVIS_PULL_REQUEST_SLUG" != "ascoderu/lokole" ]] && [[ "$TEST_MODE" = "live" ]]; then echo "Skipping live service CI for fork build" >&2 exit 0 fi diff --git a/.travis.yml b/.travis.yml index 8978c076..98b52da2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ deploy: skip-cleanup: true script: ./.travis.sh deploy on: # yamllint disable rule:truthy - repo: ascoderu/opwen-cloudserver + repo: ascoderu/lokole tags: true condition: $TEST_MODE = local @@ -51,6 +51,6 @@ deploy: github-token: $GITHUB_TOKEN local-dir: build on: # yamllint disable rule:truthy - repo: ascoderu/opwen-cloudserver + repo: ascoderu/lokole tags: true condition: $TEST_MODE = local diff --git a/README.rst b/README.rst index 9381c09b..adf47a4b 100644 --- a/README.rst +++ b/README.rst @@ -1,18 +1,18 @@ -================= -Opwen cloudserver -================= +====== +Lokole +====== -.. image:: https://travis-ci.org/ascoderu/opwen-cloudserver.svg?branch=master - :target: https://travis-ci.org/ascoderu/opwen-cloudserver +.. image:: https://travis-ci.org/ascoderu/lokole.svg?branch=master + :target: https://travis-ci.org/ascoderu/lokole .. image:: https://img.shields.io/pypi/v/opwen_email_client.svg :target: https://pypi.python.org/pypi/opwen_email_client/ -.. image:: https://pyup.io/repos/github/ascoderu/opwen-cloudserver/shield.svg - :target: https://pyup.io/repos/github/ascoderu/opwen-cloudserver/ +.. image:: https://pyup.io/repos/github/ascoderu/lokole/shield.svg + :target: https://pyup.io/repos/github/ascoderu/lokole/ -.. image:: https://codecov.io/gh/ascoderu/opwen-cloudserver/branch/master/graph/badge.svg - :target: https://codecov.io/gh/ascoderu/opwen-cloudserver +.. image:: https://codecov.io/gh/ascoderu/lokole/branch/master/graph/badge.svg + :target: https://codecov.io/gh/ascoderu/lokole ------------ What's this? @@ -130,8 +130,8 @@ Second, get the source code. .. sourcecode :: sh - git clone git@github.com:ascoderu/opwen-cloudserver.git - cd opwen-cloudserver + git clone git@github.com:ascoderu/lokole.git + cd lokole Third, build the project images. This will also verify your checkout by running the unit tests and other CI steps such as linting: @@ -251,7 +251,7 @@ The script will then provision a cluster in Azure Kubernetes Service and install the project via Helm. The secrets to connect to the provisioned cluster will be stored in the :code:`secrets` directory. -There is a `script `_ +There is a `script `_ to set up a new Lokole email client. The script will install the email app in this repository as well as standard infrastructure like nginx and gunicorn. The script will also make ready peripherals like the USB modem used for data @@ -288,14 +288,14 @@ The setup script is also tested with USB modems: The setup script installs the latest version of the email app published to PyPI. New versions get automatically published to PyPI (via Travis) whenever a new -`release `_ is created +`release `_ is created on Github. You can run the script on your client device like so: .. sourcecode :: sh - curl -fsO https://raw.githubusercontent.com/ascoderu/opwen-cloudserver/master/install.py && \ + curl -fsO https://raw.githubusercontent.com/ascoderu/lokole/master/install.py && \ sudo python3 install.py --------------------- diff --git a/docker/setup/setup.sh b/docker/setup/setup.sh index 27585142..3a7d31cc 100755 --- a/docker/setup/setup.sh +++ b/docker/setup/setup.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ## ## This script sets up all the required Azure resources for the -## opwen-cloudserver project. The script stores the secrets to +## lokole project. The script stores the secrets to ## access the created resources in the folder /secrets as dotenv files. ## ## Required environment variables: diff --git a/docker/setup/vm.sh b/docker/setup/vm.sh index 5cf4cba2..3317d586 100755 --- a/docker/setup/vm.sh +++ b/docker/setup/vm.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash if [[ "$1" != "install" ]]; then - cd /home/opwen/opwen-cloudserver || exit 99 + cd /home/opwen/lokole || exit 99 git fetch origin --prune || exit 1 git reset --hard origin/master || exit 1 cd - || exit 99 - docker-compose -f /home/opwen/opwen-cloudserver/docker/docker-compose.prod.yml pull || exit 2 - docker-compose -f /home/opwen/opwen-cloudserver/docker/docker-compose.prod.yml up -d || exit 3 + docker-compose -f /home/opwen/lokole/docker/docker-compose.prod.yml pull || exit 2 + docker-compose -f /home/opwen/lokole/docker/docker-compose.prod.yml up -d || exit 3 exit 0 fi @@ -60,14 +60,14 @@ sudo chmod 0755 /etc/letsencrypt/{live,archive} # set up app # important: remember to scp the secrets to the vm manually # -git clone https://github.com/ascoderu/opwen-cloudserver.git -docker-compose -f opwen-cloudserver/docker/docker-compose.prod.yml pull -docker-compose -f opwen-cloudserver/docker/docker-compose.prod.yml up -d +git clone https://github.com/ascoderu/lokole.git +docker-compose -f lokole/docker/docker-compose.prod.yml pull +docker-compose -f lokole/docker/docker-compose.prod.yml up -d # # set up nginx # -cat > opwen-cloudserver/secrets/nginx.env << EOM +cat > lokole/secrets/nginx.env << EOM NGINX_WORKERS=auto HOSTNAME_WEBAPP=localhost:8080 HOSTNAME_EMAIL_RECEIVE=localhost:8888 @@ -76,10 +76,10 @@ HOSTNAME_CLIENT_WRITE=localhost:8888 HOSTNAME_CLIENT_READ=localhost:8888 HOSTNAME_CLIENT_REGISTER=localhost:8888 PORT=80 -STATIC_ROOT=/home/opwen/opwen-cloudserver/docker/nginx +STATIC_ROOT=/home/opwen/lokole/docker/nginx LETSENCRYPT_DOMAIN=${hostname} EOM docker pull ascoderu/opwenserver_nginx -docker run --env-file opwen-cloudserver/secrets/nginx.env --rm ascoderu/opwenserver_nginx sh -c 'mo < /app/nginx.conf.template' | sudo tee /etc/nginx/nginx.conf -docker run --env-file opwen-cloudserver/secrets/nginx.env --rm ascoderu/opwenserver_nginx sh -c 'mo < /app/server.conf.template' | sudo tee /etc/nginx/sites-available/default +docker run --env-file lokole/secrets/nginx.env --rm ascoderu/opwenserver_nginx sh -c 'mo < /app/nginx.conf.template' | sudo tee /etc/nginx/nginx.conf +docker run --env-file lokole/secrets/nginx.env --rm ascoderu/opwenserver_nginx sh -c 'mo < /app/server.conf.template' | sudo tee /etc/nginx/sites-available/default sudo systemctl reload nginx diff --git a/docker/statuspage/Dockerfile b/docker/statuspage/Dockerfile index 25f35a00..142612f9 100644 --- a/docker/statuspage/Dockerfile +++ b/docker/statuspage/Dockerfile @@ -18,6 +18,6 @@ RUN npm install -g serve@11.3.0 WORKDIR /app -COPY --from=compiler /app/opwen_statuspage/build ./opwen-statuspage/ +COPY --from=compiler /app/opwen_statuspage/build ./lokole/ CMD ["serve", "-n", "."] diff --git a/helm/opwen_cloudserver/Chart.yaml b/helm/opwen_cloudserver/Chart.yaml index 1257e38d..ff7aa689 100644 --- a/helm/opwen_cloudserver/Chart.yaml +++ b/helm/opwen_cloudserver/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: "v1" kind: Chart name: opwen_cloudserver -description: A Helm Chart for the OPWEN email server by Ascoderu +description: A Helm Chart for the Lokole email server by Ascoderu version: 0.0.1 keywords: - ascoderu sources: - - https://github.com/ascoderu/opwen-cloudserver + - https://github.com/ascoderu/lokole diff --git a/install.py b/install.py index 365d8e56..054a3073 100644 --- a/install.py +++ b/install.py @@ -810,7 +810,7 @@ def cli(): parser = ArgumentParser(description=__doc__) parser.add_argument('client_name', type=str.lower, help=( - 'The name that should be assigned to the Opwen device ' + 'The name that should be assigned to the Lokole device ' 'that is being configured by this script. Usually this ' 'will be a name that is descriptive for the location ' 'where the device will be deployed. The client name ' diff --git a/makefile b/makefile index 38f3c19a..7cca7d0a 100644 --- a/makefile +++ b/makefile @@ -136,7 +136,7 @@ release-docker: release-gh-pages: docker container create --name statuspage "$(DOCKER_USERNAME)/opwenstatuspage:$(DOCKER_TAG)" && \ - docker cp "statuspage:/app/opwen-statuspage" ./build && \ + docker cp "statuspage:/app/lokole" ./build && \ docker container rm statuspage release: release-docker release-gh-pages release-pypi diff --git a/opwen_email_server/swagger/client-metrics.yaml b/opwen_email_server/swagger/client-metrics.yaml index 45aba138..c9bf2132 100644 --- a/opwen_email_server/swagger/client-metrics.yaml +++ b/opwen_email_server/swagger/client-metrics.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver Email API. + title: Lokole Cloudserver Email API. version: '0.1' basePath: '/api/email/metrics' diff --git a/opwen_email_server/swagger/client-read.yaml b/opwen_email_server/swagger/client-read.yaml index ddef9fef..750bfdb1 100644 --- a/opwen_email_server/swagger/client-read.yaml +++ b/opwen_email_server/swagger/client-read.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver Email API. + title: Lokole Cloudserver Email API. version: '0.1' basePath: '/api/email/download' diff --git a/opwen_email_server/swagger/client-register.yaml b/opwen_email_server/swagger/client-register.yaml index 6d49a7e6..4abcfa29 100644 --- a/opwen_email_server/swagger/client-register.yaml +++ b/opwen_email_server/swagger/client-register.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver Email API. + title: Lokole Cloudserver Email API. version: '0.1' basePath: '/api/email/register' diff --git a/opwen_email_server/swagger/client-write.yaml b/opwen_email_server/swagger/client-write.yaml index f81363e3..6a607b01 100644 --- a/opwen_email_server/swagger/client-write.yaml +++ b/opwen_email_server/swagger/client-write.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver Email API. + title: Lokole Cloudserver Email API. version: '0.1' basePath: '/api/email/upload' diff --git a/opwen_email_server/swagger/email-receive.yaml b/opwen_email_server/swagger/email-receive.yaml index 11e5dd95..b9d749c2 100644 --- a/opwen_email_server/swagger/email-receive.yaml +++ b/opwen_email_server/swagger/email-receive.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver Email API. + title: Lokole Cloudserver Email API. version: '0.1' basePath: '/api/email/sendgrid' diff --git a/opwen_email_server/swagger/healthcheck.yaml b/opwen_email_server/swagger/healthcheck.yaml index 7c2d52c6..ff76ba62 100644 --- a/opwen_email_server/swagger/healthcheck.yaml +++ b/opwen_email_server/swagger/healthcheck.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: - title: Opwen Cloudserver health-check endpoints. + title: Lokole Cloudserver health-check endpoints. version: '0.1' basePath: '/healthcheck' diff --git a/opwen_statuspage/package.json b/opwen_statuspage/package.json index 56117f3c..1122527b 100644 --- a/opwen_statuspage/package.json +++ b/opwen_statuspage/package.json @@ -1,6 +1,6 @@ { "name": "opwen-statuspage", - "homepage": "https://ascoderu.ca/opwen-statuspage", + "homepage": "https://ascoderu.ca/lokole", "version": "0.1.0", "license": "Apache-2.0", "engines": { diff --git a/opwen_statuspage/public/index.html b/opwen_statuspage/public/index.html index 36a1e55b..0b685e0a 100644 --- a/opwen_statuspage/public/index.html +++ b/opwen_statuspage/public/index.html @@ -3,7 +3,7 @@ - Opwen Status Dashboard + Lokole Status Dashboard diff --git a/opwen_statuspage/src/Header.js b/opwen_statuspage/src/Header.js index a7f2e14e..d05dc612 100644 --- a/opwen_statuspage/src/Header.js +++ b/opwen_statuspage/src/Header.js @@ -25,7 +25,7 @@ class Header extends React.PureComponent { return (