Skip to content

Commit

Permalink
Rename repo
Browse files Browse the repository at this point in the history
  • Loading branch information
c-w committed Apr 29, 2020
1 parent 6d594d8 commit f85a763
Show file tree
Hide file tree
Showing 20 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
28 changes: 14 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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?
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 <https://github.com/ascoderu/opwen-cloudserver/blob/master/install.py>`_
There is a `script <https://github.com/ascoderu/lokole/blob/master/install.py>`_
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
Expand Down Expand Up @@ -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 <https://github.com/ascoderu/opwen-cloudserver/releases/new>`_ is created
`release <https://github.com/ascoderu/lokole/releases/new>`_ 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 <client-name> <sim-type> <sync-schedule> <registration-credentials>
---------------------
Expand Down
2 changes: 1 addition & 1 deletion docker/setup/setup.sh
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
20 changes: 10 additions & 10 deletions docker/setup/vm.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion docker/statuspage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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", "."]
4 changes: 2 additions & 2 deletions helm/opwen_cloudserver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/client-metrics.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/client-read.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/client-register.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/client-write.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/email-receive.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_email_server/swagger/healthcheck.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion opwen_statuspage/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion opwen_statuspage/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Opwen Status Dashboard</title>
<title>Lokole Status Dashboard</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
2 changes: 1 addition & 1 deletion opwen_statuspage/src/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Header extends React.PureComponent {
return (
<React.Fragment>
<PageHeader
title="Opwen Status Dashboard"
title="Lokole Status Dashboard"
avatar={
settings.githubAvatarUrl != null
? { src: settings.githubAvatarUrl }
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "opwen-cloudserver",
"name": "opwen-email-client",
"version": "0.0.1",
"description": " ",
"author": "Clemens Wolff",
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def requirements_for(name):
setup(
name=client_package,
version=version,
author='Clemens Wolff',
author_email='clemens.wolff+pypi@gmail.com',
author='Ascoderu',
author_email='ascoderu.opwen@gmail.com',
packages=find_packages(exclude=['tests*']),
url='https://github.com/ascoderu/opwen-cloudserver',
url='https://github.com/ascoderu/lokole',
license='Apache Software License',
description='Email client for the Lokole project: https://ascoderu.ca',
long_description=long_description,
Expand Down

0 comments on commit f85a763

Please sign in to comment.