Updated strongTNC configuration
This commit is contained in:
@@ -51,10 +51,7 @@ do
|
|||||||
if [ "$host" = "alice" ]
|
if [ "$host" = "alice" ]
|
||||||
then
|
then
|
||||||
execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0
|
execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0
|
||||||
execute "mkdir $LOOPDIR/etc/strongTNC" 0
|
|
||||||
execute "mkdir $LOOPDIR/etc/pts" 0
|
execute "mkdir $LOOPDIR/etc/pts" 0
|
||||||
execute_chroot "chgrp www-data /etc/strongTNC" 0
|
|
||||||
execute_chroot "chmod g+w /etc/strongTNC" 0
|
|
||||||
execute_chroot "chgrp www-data /etc/pts" 0
|
execute_chroot "chgrp www-data /etc/pts" 0
|
||||||
execute_chroot "chmod g+w /etc/pts" 0
|
execute_chroot "chmod g+w /etc/pts" 0
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -19,4 +19,4 @@ $(DEPS): $(PKG)-master
|
|||||||
|
|
||||||
install: $(DEPS)
|
install: $(DEPS)
|
||||||
pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(PKG)-master/requirements.txt
|
pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(PKG)-master/requirements.txt
|
||||||
cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc
|
cp -r $(PKG)-master /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+w /var/www/tnc /var/www/tnc/django.db
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ WSGIPythonPath /var/www/tnc
|
|||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
|
|
||||||
|
Alias /static/ /var/www/tnc/static/
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
|
ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
|
||||||
LogLevel warn
|
LogLevel warn
|
||||||
CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined
|
CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
[debug]
|
[debug]
|
||||||
DEBUG=1
|
DEBUG=0
|
||||||
TEMPLATE_DEBUG=1
|
TEMPLATE_DEBUG=0
|
||||||
DEBUG_TOOLBAR=0
|
DEBUG_TOOLBAR=0
|
||||||
|
|
||||||
[db]
|
[db]
|
||||||
DJANGO_DB_URL=sqlite:////etc/strongTNC/django.db
|
DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
|
||||||
STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
|
STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
|
||||||
|
|
||||||
[localization]
|
[localization]
|
||||||
@@ -16,4 +16,4 @@ Your Name: [email protected]
|
|||||||
|
|
||||||
[security]
|
[security]
|
||||||
SECRET_KEY=strongSwan
|
SECRET_KEY=strongSwan
|
||||||
|
ALLOWED_HOSTS=127.0.0.1,10.10.0.1,tnc.strongswan.org,tnc
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
|
|||||||
alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
|
alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
|
||||||
alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
|
alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
|
||||||
alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
|
alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
|
||||||
|
alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
|
||||||
alice::service apache2 start
|
alice::service apache2 start
|
||||||
alice::ipsec start
|
alice::ipsec start
|
||||||
moon::ipsec start
|
moon::ipsec start
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ WSGIPythonPath /var/www/tnc
|
|||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
|
|
||||||
|
Alias /static/ /var/www/tnc/static/
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
|
ErrorLog ${APACHE_LOG_DIR}/tnc/error.log
|
||||||
LogLevel warn
|
LogLevel warn
|
||||||
CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined
|
CustomLog ${APACHE_LOG_DIR}/tnc/access.log combined
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
[debug]
|
[debug]
|
||||||
DEBUG=1
|
DEBUG=0
|
||||||
TEMPLATE_DEBUG=1
|
TEMPLATE_DEBUG=0
|
||||||
DEBUG_TOOLBAR=0
|
DEBUG_TOOLBAR=0
|
||||||
|
|
||||||
[db]
|
[db]
|
||||||
DJANGO_DB_URL=sqlite:////etc/strongTNC/django.db
|
DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
|
||||||
STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
|
STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
|
||||||
|
|
||||||
[localization]
|
[localization]
|
||||||
@@ -16,4 +16,4 @@ Your Name: [email protected]
|
|||||||
|
|
||||||
[security]
|
[security]
|
||||||
SECRET_KEY=strongSwan
|
SECRET_KEY=strongSwan
|
||||||
|
ALLOWED_HOSTS=127.0.0.1,10.10.0.1,tnc.strongswan.org,tnc
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ dave::cat /etc/tnc_config
|
|||||||
alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
|
alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
|
||||||
alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
|
alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
|
||||||
alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
|
alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
|
||||||
|
alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
|
||||||
alice::service apache2 start
|
alice::service apache2 start
|
||||||
alice::ipsec start
|
alice::ipsec start
|
||||||
alice::sleep 1
|
alice::sleep 1
|
||||||
|
|||||||
Reference in New Issue
Block a user