clara/Inventarium
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Clemens-Dautermann 2018-12-28 20:22:56 +01:00
commit 721a2d5210
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2018 CDautermann Copyright (c) 2018 Clemens Dautermann
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

6
README.md
View file

@ -3,8 +3,8 @@
This project is a django server inventarization system. It requires docker This project is a django server inventarization system. It requires docker
and docker compose as well as the python modules stated in the requirements.txt. It can be used to and docker compose as well as the python modules stated in the requirements.txt. It can be used to
inventarize and document basically everything. inventarize and document basically everything.
##Setup ## Setup
###Installation ### Installation
1. Install `docker` and `docker-compose` from [here](https://www.docker.com/get-started) and [here](https://docs.docker.com/compose/install/) 1. Install `docker` and `docker-compose` from [here](https://www.docker.com/get-started) and [here](https://docs.docker.com/compose/install/)
2. Clone this repository 2. Clone this repository
3. Go into the root directory of the repository (where docker-compose.yml) lives and open 3. Go into the root directory of the repository (where docker-compose.yml) lives and open
@ -13,7 +13,7 @@ a terminal
database and the django server will be pulled and configured automatically. This step database and the django server will be pulled and configured automatically. This step
requires some disk space and an active internet connection requires some disk space and an active internet connection
5. You now need to create a database user 5. You now need to create a database user
###Creating a database user ### Creating a database user
In order to access the system you will need to create a database user so django can In order to access the system you will need to create a database user so django can
interface with the database and you can log in to interact with the server e.g. create interface with the database and you can log in to interact with the server e.g. create
additional users or inventarize objects. additional users or inventarize objects.