strongswan / strongTNC

BYOD TNC Database Management Tool
GNU Affero General Public License v3.0
21 stars 10 forks source link

Integration Request 4 #11

Closed dbrgn closed 10 years ago

dbrgn commented 10 years ago

Features

This pull request includes many changes, including:

These things were enabled to facilitate testing. If you want us to remove them for security reasons, let us know and we'll add them to this pull request. If not, we'll change those issues with the last pull request during this project.

Upgrade Notes

If you've already installed a version that contains django-dajaxice-ng, you should uninstall it before upgrading to the new requirements. This is necessary because we switched from django-dajaxice-ng to django-dajaxice. These two packages are conflicting.

pip uninstall django-dajaxice-ng
pip install -U -r requirements.txt

If you have an already existing database and don't want to switch to the included default database, we provided a SQL script (https://github.com/tnc-ba/strongTNC/blob/integration4/scripts/fix_db.sql) that fixes the following issues:

To apply, first create a backup of the current database and then run the following commands:

$ sqlite3 ipsec.config.db
sqlite> .read scripts/fix_db.sql
tobiasbrunner commented 10 years ago

Please rebase the branch to our current master. The commits that are already merged should automatically disappear.

dbrgn commented 10 years ago

Please rebase the branch to our current master. The commits that are already merged should automatically disappear.

Oops, it wasn't already rebased? Strange. I already wondered why there were so many new commits in this PR :) We'll do the rebase soon, together with the other changes.

dbrgn commented 10 years ago

Branch has been rebased against upstream master.

tobiasbrunner commented 10 years ago

Great, thanks.