diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2013-06-23 19:21:02 +0200 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2013-06-23 19:21:02 +0200 |
| commit | 07657926b947094ff9914bf01e845b967eb08a2f (patch) | |
| tree | 1d50c3bd5fea4c68cb3782021af84d0ea8c9eda6 /config | |
| parent | Added main readme, work on contributing doc. (diff) | |
| download | awx-07657926b947094ff9914bf01e845b967eb08a2f.tar.xz awx-07657926b947094ff9914bf01e845b967eb08a2f.zip | |
Rename ansibleworks to awx.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ansibleworks.conf | 32 | ||||
| -rw-r--r-- | config/awx.conf | 32 | ||||
| -rw-r--r-- | config/settings.py | 12 |
3 files changed, 38 insertions, 38 deletions
diff --git a/config/ansibleworks.conf b/config/ansibleworks.conf deleted file mode 100644 index ecdcd5f740..0000000000 --- a/config/ansibleworks.conf +++ /dev/null @@ -1,32 +0,0 @@ -NameVirtualHost *:80 -WSGISocketPrefix run/wsgi - -<VirtualHost _default_:80> - ServerName localhost - ServerAlias localhost - ServerAlias 127.0.0.1 - DocumentRoot /var/lib/ansibleworks/public - - WSGIScriptAlias / /var/lib/ansibleworks/wsgi.py - WSGIPassAuthorization On - - # FIXME: May want to tune these parameters after performance testing. - WSGIDaemonProcess ansibleworks user=ansibleworks group=ansibleworks processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" - WSGIProcessGroup ansibleworks - - Alias /favicon.ico /var/lib/ansibleworks/public/static/favicon.ico - Alias /static/ /var/lib/ansibleworks/public/static/ - - <Directory /var/lib/ansibleworks/> - <Files wsgi.py> - Order deny,allow - Allow from all - </Files> - </Directory> - - <Directory /var/lib/ansibleworks/public/> - Order deny,allow - Allow from all - </Directory> - -</VirtualHost> diff --git a/config/awx.conf b/config/awx.conf new file mode 100644 index 0000000000..5905373328 --- /dev/null +++ b/config/awx.conf @@ -0,0 +1,32 @@ +NameVirtualHost *:80 +WSGISocketPrefix run/wsgi + +<VirtualHost _default_:80> + ServerName localhost + ServerAlias localhost + ServerAlias 127.0.0.1 + DocumentRoot /var/lib/awx/public + + WSGIScriptAlias / /var/lib/awx/wsgi.py + WSGIPassAuthorization On + + # FIXME: May want to tune these parameters after performance testing. + WSGIDaemonProcess awx user=awx group=awx processes=2 threads=20 maximum-requests=1000 display-name="%{GROUP}" + WSGIProcessGroup awx + + Alias /favicon.ico /var/lib/awx/public/static/favicon.ico + Alias /static/ /var/lib/awx/public/static/ + + <Directory /var/lib/awx/> + <Files wsgi.py> + Order deny,allow + Allow from all + </Files> + </Directory> + + <Directory /var/lib/awx/public/> + Order deny,allow + Allow from all + </Directory> + +</VirtualHost> diff --git a/config/settings.py b/config/settings.py index dde18c3e8c..ab821fbcd4 100644 --- a/config/settings.py +++ b/config/settings.py @@ -5,19 +5,19 @@ ADMINS = ( DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'ansibleworks', - 'USER': 'ansibleworks', + 'NAME': 'awx', + 'USER': 'awx', 'PASSWORD': 'AWsecret', 'HOST': '', 'PORT': '', } } -STATIC_ROOT = '/var/lib/ansibleworks/public/static' +STATIC_ROOT = '/var/lib/awx/public/static' -PROJECTS_ROOT = '/var/lib/ansibleworks/projects' +PROJECTS_ROOT = '/var/lib/awx/projects' -SECRET_KEY = file('/etc/ansibleworks/SECRET_KEY', 'rb').read().strip() +SECRET_KEY = file('/etc/awx/SECRET_KEY', 'rb').read().strip() ALLOWED_HOSTS = ['*'] @@ -32,7 +32,7 @@ LOGGING['handlers']['syslog'] = { SERVER_EMAIL = 'root@localhost' DEFAULT_FROM_EMAIL = 'webmaster@localhost' -EMAIL_SUBJECT_PREFIX = '[AnsibleWorks] ' +EMAIL_SUBJECT_PREFIX = '[AWX] ' EMAIL_HOST = 'localhost' EMAIL_PORT = 25 |