Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-14 06:50:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49 from TrentBartlem/master

Browse Source 
Adjust vagrant scripts; enable env variable override
This commit is contained in:
Raynaldo Rivera 2015-01-14 13:57:40 -07:00
commit 051e340640
3 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
alliance_auth/settings.py.example
View File

@ -20,10 +20,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '5xvh4e0x&@-$6(kj%4^80pdo1n5v-!mtx(e(1tw@kn-1le*ts@' SECRET_KEY = os.environ.get('AA_SECRET_KEY', '5xvh4e0x&@-$6(kj%4^80pdo1n5v-!mtx(e(1tw@kn-1le*ts@')
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = 'True' == os.environ.get('AA_DEBUG','True')
TEMPLATE_DEBUG = True TEMPLATE_DEBUG = True
@ -77,28 +77,28 @@ DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': 'alliance_auth', 'NAME': 'alliance_auth',
'USER': 'allianceauth', 'USER': os.environ.get('AA_DB_DEFAULT_USER', 'allianceauth'),
'PASSWORD': 'allianceauth', 'PASSWORD': os.environ.get('AA_DB_DEFAULT_PASSWORD', 'allianceauth'),
'HOST': '127.0.0.1', 'HOST': os.environ.get('AA_DB_DEFAULT_HOST', '127.0.0.1'),
'PORT': '3306', 'PORT': os.environ.get('AA_DB_DEFAULT_PORT', '3306'),
}, },
'phpbb3': { 'phpbb3': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': 'alliance_forum', 'NAME': 'alliance_forum',
'USER': 'allianceauth', 'USER': os.environ.get('AA_DB_PHPBB3_USER', 'allianceauth'),
'PASSWORD': 'allianceauth', 'PASSWORD': os.environ.get('AA_DB_PHPBB3_PASSWORD', 'allianceauth'),
'HOST': '127.0.0.1', 'HOST': os.environ.get('AA_DB_PHPBB3_HOST', '127.0.0.1'),
'PORT': '3306', 'PORT': os.environ.get('AA_DB_PHPBB3_PORT', '3306'),
}, },
'mumble': { 'mumble': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': 'alliance_mumble', 'NAME': 'alliance_mumble',
'USER': 'alliancemumble', 'USER': os.environ.get('AA_DB_MUMBLE_USER', 'alliancemumble'),
'PASSWORD': 'alliancemumble', 'PASSWORD': os.environ.get('AA_DB_MUMBLE_PASSWORD', 'alliancemumble'),
'HOST': '127.0.0.1', 'HOST': os.environ.get('AA_DB_MUMBLE_HOST', '127.0.0.1'),
'PORT': '3306', 'PORT': os.environ.get('AA_DB_MUMBLE_PORT', '3306'),
} }
} }
@ -130,9 +130,9 @@ LOGIN_URL = '/login_user/'
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/ # https://docs.djangoproject.com/en/1.6/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = os.environ.get('AA_LANGUAGE_CODE', 'en-us')
TIME_ZONE = 'UTC' TIME_ZONE = os.environ.get('AA_TIME_ZONE', 'UTC')
USE_I18N = True USE_I18N = True
@ -160,12 +160,12 @@ STATIC_URL = '/static/'
# EMAIL_HOST_PASSWORD - Email Password # EMAIL_HOST_PASSWORD - Email Password
# EMAIL_USE_TLS - Set to use TLS encryption # EMAIL_USE_TLS - Set to use TLS encryption
################# #################
DOMAIN = 'https://the99eve.com' DOMAIN = os.environ.get('AA_DOMAIN', 'https://the99eve.com')
EMAIL_HOST = 'smtp.gmail.com' EMAIL_HOST = os.environ.get('AA_EMAIL_HOST', 'smtp.gmail.com')
EMAIL_PORT = 587 EMAIL_PORT = int(os.environ.get('AA_EMAIL_PORT', '587'))
EMAIL_HOST_USER = '' EMAIL_HOST_USER = os.environ.get('AA_EMAIL_HOST_USER', '')
EMAIL_HOST_PASSWORD = '' EMAIL_HOST_PASSWORD = os.environ.get('AA_EMAIL_HOST_PASSWORD', '')
EMAIL_USE_TLS = True EMAIL_USE_TLS = 'True' == os.environ.get('AA_EMAIL_USE_TLS', 'True')
######################### #########################
# Default Group Settings # Default Group Settings
@ -173,8 +173,8 @@ EMAIL_USE_TLS = True
# DEFAULT_ALLIANCE_GROUP - Default group alliance members are put in # DEFAULT_ALLIANCE_GROUP - Default group alliance members are put in
# DEFAULT_BLUE_GROUP - Default group for blue members # DEFAULT_BLUE_GROUP - Default group for blue members
######################### #########################
DEFAULT_ALLIANCE_GROUP = 'AllianceMember' DEFAULT_ALLIANCE_GROUP = os.environ.get('AA_DEFAULT_ALLIANCE_GROUP', 'AllianceMember')
DEFAULT_BLUE_GROUP = 'BlueMember' DEFAULT_BLUE_GROUP = os.environ.get('AA_DEFAULT_BLUE_GROUP', 'BlueMember')
######################### #########################
# Alliance Service Setup # Alliance Service Setup
@ -184,11 +184,11 @@ DEFAULT_BLUE_GROUP = 'BlueMember'
# ENABLE_ALLIANCE_MUMBLE - Enable mumble support in the auth for alliance members # ENABLE_ALLIANCE_MUMBLE - Enable mumble support in the auth for alliance members
# ENABLE_ALLIANCE_IPBOARD - Enable IPBoard forum support in the auth for alliance members # ENABLE_ALLIANCE_IPBOARD - Enable IPBoard forum support in the auth for alliance members
######################### #########################
ENABLE_ALLIANCE_FORUM = True ENABLE_ALLIANCE_FORUM = 'True' == os.environ.get('AA_ENABLE_ALLIANCE_FORUM', 'True')
ENABLE_ALLIANCE_JABBER = True ENABLE_ALLIANCE_JABBER = 'True' == os.environ.get('AA_ENABLE_ALLIANCE_JABBER', 'True')
ENABLE_ALLIANCE_MUMBLE = True ENABLE_ALLIANCE_MUMBLE = 'True' == os.environ.get('AA_ENABLE_ALLIANCE_MUMBLE', 'True')
ENABLE_ALLIANCE_IPBOARD = False ENABLE_ALLIANCE_IPBOARD = 'True' == os.environ.get('AA_ENABLE_ALLIANCE_IPBOARD', 'False')
ENABLE_ALLIANCE_TEAMSPEAK3 = False ENABLE_ALLIANCE_TEAMSPEAK3 = 'True' == os.environ.get('AA_ENABLE_ALLIANCE_TEAMSPEAK3', 'False')
##################### #####################
# Blue service Setup # Blue service Setup
@ -198,11 +198,11 @@ ENABLE_ALLIANCE_TEAMSPEAK3 = False
# ENABLE_BLUE_MUMBLE - Enable mumble support in the auth for blues # ENABLE_BLUE_MUMBLE - Enable mumble support in the auth for blues
# ENABLE_BLUE_IPBOARD - Enable IPBoard forum support in the auth for blues # ENABLE_BLUE_IPBOARD - Enable IPBoard forum support in the auth for blues
##################### #####################
ENABLE_BLUE_FORUM = False ENABLE_BLUE_FORUM = 'True' == os.environ.get('AA_ENABLE_BLUE_FORUM', 'False')
ENABLE_BLUE_JABBER = False ENABLE_BLUE_JABBER = 'True' == os.environ.get('AA_ENABLE_BLUE_JABBER', 'False')
ENABLE_BLUE_MUMBLE = True ENABLE_BLUE_MUMBLE = 'True' == os.environ.get('AA_ENABLE_BLUE_MUMBLE', 'True')
ENABLE_BLUE_IPBOARD = False ENABLE_BLUE_IPBOARD = 'True' == os.environ.get('AA_ENABLE_BLUE_IPBOARD', 'False')
ENABLE_BLUE_TEAMSPEAK3 = False ENABLE_BLUE_TEAMSPEAK3 = 'True' == os.environ.get('AA_ENABLE_BLUE_TEAMSPEAK3', 'False')
######################### #########################
# Alliance Configuration # Alliance Configuration
@ -213,11 +213,11 @@ ENABLE_BLUE_TEAMSPEAK3 = False
# ALLIANCE_EXEC_CORP_VCODE - Set this to the api vcode for the exe corp # ALLIANCE_EXEC_CORP_VCODE - Set this to the api vcode for the exe corp
# ALLIANCE_BLUE_STANDING - The default lowest standings setting to consider blue # ALLIANCE_BLUE_STANDING - The default lowest standings setting to consider blue
######################## ########################
ALLIANCE_ID = '99001336' ALLIANCE_ID = os.environ.get('AA_ALLIANCE_ID', '99001336')
ALLIANCE_NAME = 'Somealliance' ALLIANCE_NAME = os.environ.get('AA_ALLIANCE_NAME', 'Somealliance')
ALLIANCE_EXEC_CORP_ID = '' ALLIANCE_EXEC_CORP_ID = os.environ.get('AA_ALLIANCE_EXEC_CORP_ID', '')
ALLIANCE_EXEC_CORP_VCODE = '' ALLIANCE_EXEC_CORP_VCODE = os.environ.get('AA_ALLIANCE_EXEC_CORP_VCODE', '')
ALLIANCE_BLUE_STANDING = 5.0 ALLIANCE_BLUE_STANDING = float(os.environ.get('AA_ALLIANCE_BLUE_STANDING', '5.0'))
##################### #####################
# HR Configuration # HR Configuration
@ -225,7 +225,7 @@ ALLIANCE_BLUE_STANDING = 5.0
# JACK_KNIFE_URL - Url for the audit page of API Jack knife # JACK_KNIFE_URL - Url for the audit page of API Jack knife
# Should seriously replace with your own. # Should seriously replace with your own.
##################### #####################
JACK_KNIFE_URL = 'http://ridetheclown.com/eveapi/audit.php' JACK_KNIFE_URL = os.environ.get('AA_JACK_KNIFE_URL', 'http://ridetheclown.com/eveapi/audit.php')
##################### #####################
# Forum Configuration # Forum Configuration
@ -235,9 +235,9 @@ JACK_KNIFE_URL = 'http://ridetheclown.com/eveapi/audit.php'
# IPBOARD_APIKEY - Api key to interact with ipboard # IPBOARD_APIKEY - Api key to interact with ipboard
# IPBOARD_APIMODULE - Module for alliance auth *leave alone* # IPBOARD_APIMODULE - Module for alliance auth *leave alone*
##################### #####################
FORUM_URL = "http://someaddress.com" FORUM_URL = os.environ.get('AA_FORUM_URL', "http://someaddress.com")
IPBOARD_ENDPOINT = 'someaddress.com/interface/board/index.php' IPBOARD_ENDPOINT = os.environ.get('AA_IPBOARD_ENDPOINT', 'someaddress.com/interface/board/index.php')
IPBOARD_APIKEY = 'somekeyhere' IPBOARD_APIKEY = os.environ.get('AA_IPBOARD_APIKEY', 'somekeyhere')
IPBOARD_APIMODULE = 'aa' IPBOARD_APIMODULE = 'aa'
###################### ######################
@ -251,13 +251,13 @@ IPBOARD_APIMODULE = 'aa'
# BROADCAST_USER - Broadcast user JID # BROADCAST_USER - Broadcast user JID
# BROADCAST_USER_PASSWORD - Broadcast user password # BROADCAST_USER_PASSWORD - Broadcast user password
###################### ######################
JABBER_URL = "someaddress.com" JABBER_URL = os.environ.get('AA_JABBER_URL', "someaddress.com")
JABBER_PORT = 5223 JABBER_PORT = int(os.environ.get('AA_JABBER_PORT', '5223'))
JABBER_SERVER = "someadddress.com" JABBER_SERVER = os.environ.get('AA_JABBER_SERVER', "someadddress.com")
OPENFIRE_ADDRESS = "http://someaddress.com:9090/" OPENFIRE_ADDRESS = os.environ.get('AA_OPENFIRE_ADDRESS', "http://someaddress.com:9090/")
OPENFIRE_SECRET_KEY = "somekey" OPENFIRE_SECRET_KEY = os.environ.get('AA_OPENFIRE_SECRET_KEY', "somekey")
BROADCAST_USER = "broadcast@" + JABBER_URL BROADCAST_USER = os.environ.get('AA_BROADCAST_USER', "broadcast@") + JABBER_URL
BROADCAST_USER_PASSWORD = "somepassword" BROADCAST_USER_PASSWORD = os.environ.get('AA_BROADCAST_USER_PASSWORD', "somepassword")
###################################### ######################################
# Mumble Configuration # Mumble Configuration
@ -265,8 +265,8 @@ BROADCAST_USER_PASSWORD = "somepassword"
# MUMBLE_URL - Mumble server url # MUMBLE_URL - Mumble server url
# MUMBLE_SERVER_ID - Mumble server id # MUMBLE_SERVER_ID - Mumble server id
###################################### ######################################
MUMBLE_URL = "someurl.com" MUMBLE_URL = os.environ.get('AA_MUMBLE_URL', "someurl.com")
MUMBLE_SERVER_ID = 1 MUMBLE_SERVER_ID = int(os.environ.get('AA_MUMBLE_SERVER_ID', '1'))
###################################### ######################################
# Teamspeak3 Configuration # Teamspeak3 Configuration
@ -279,9 +279,9 @@ MUMBLE_SERVER_ID = 1
# TEAMSPEAK3_AUTHED_GROUP_ID - Default authed group id # TEAMSPEAK3_AUTHED_GROUP_ID - Default authed group id
# TEAMSPEAK3_PUBLIC_URL - teamspeak3 public url used for link creation # TEAMSPEAK3_PUBLIC_URL - teamspeak3 public url used for link creation
###################################### ######################################
TEAMSPEAK3_SERVER_IP = '127.0.0.1' TEAMSPEAK3_SERVER_IP = os.environ.get('AA_TEAMSPEAK3_SERVER_IP', '127.0.0.1')
TEAMSPEAK3_SERVER_PORT = 10011 TEAMSPEAK3_SERVER_PORT = int(os.environ.get('AA_TEAMSPEAK3_SERVER_PORT', '10011'))
TEAMSPEAK3_SERVERQUERY_USER = 'serveradmin' TEAMSPEAK3_SERVERQUERY_USER = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_USER', 'serveradmin')
TEAMSPEAK3_SERVERQUERY_PASSWORD = 'passwordhere' TEAMSPEAK3_SERVERQUERY_PASSWORD = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_PASSWORD', 'passwordhere')
TEAMSPEAK3_VIRTUAL_SERVER = 1 TEAMSPEAK3_VIRTUAL_SERVER = int(os.environ.get('AA_TEAMSPEAK3_VIRTUAL_SERVER', '1'))
TEAMSPEAK3_PUBLIC_URL = 'someaddress.com' TEAMSPEAK3_PUBLIC_URL = os.environ.get('AA_TEAMSPEAK3_PUBLIC_URL', 'someaddress.com')

7
vagrant/Vagrantfile vendored
View File

@ -18,7 +18,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Create a forwarded port mapping which allows access to a specific port # Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. # within the machine from a port on the host machine.
config.vm.network :forwarded_port, guest: 3306, host: 3306 config.vm.network :forwarded_port, guest: 3306, host: 3306
config.vm.network :forwarded_port, guest: 9090, host: 9090
config.vm.network :forwarded_port, guest: 8000, host: 8000
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "../", "/vagrant"
config.vm.provision :shell, :path => "bootstrap.sh" config.vm.provision :shell, :path => "bootstrap.sh"
end end

10
vagrant/bootstrap.sh
View File

@ -1,12 +1,16 @@
#!/usr/bin/env bash #!/usr/bin/env bash
sudo add-apt-repository ppa:upubuntu-com/xampp
sudo apt-get update sudo apt-get update
sudo apt-get clean sudo apt-get clean
sudo apt-get -y install libtool sudo apt-get -y install libtool
sudo apt-get -y install git
sudo apt-get -y install python-dev libyaml-dev libffi-dev sudo apt-get -y install python-dev libyaml-dev libffi-dev
sudo apt-get -y install python-pip sudo apt-get -y install python-pip
sudo apt-get -y install mysql-server mysql-client
cd /vagrant/ cd /vagrant/
@ -34,10 +38,14 @@ sudo mysqladmin status -p$MYSQL_ROOT_PASS
echo 'Creating databases and allianceauth user' echo 'Creating databases and allianceauth user'
sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_auth sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_auth
sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_forum sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_forum
sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_jabber
sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble
sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard
sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceauth'@'localhost' IDENTIFIED BY 'allianceauth'" sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceauth'@'localhost' IDENTIFIED BY 'allianceauth'"
sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'"; sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'";
sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'"
sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'";
sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges
@ -47,6 +55,8 @@ sudo pip install -r requirements.txt
chmod +x *.sh chmod +x *.sh
sudo apt-get -y install xampp
echo '--------' echo '--------'
echo 'Almost there!' echo 'Almost there!'
echo 'Next steps:\n' echo 'Next steps:\n'