Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dx-activities-server.spec3
-rwxr-xr-xsetup.py18
2 files changed, 12 insertions, 9 deletions
diff --git a/dx-activities-server.spec b/dx-activities-server.spec
index f3d0d5b..0ba75a4 100644
--- a/dx-activities-server.spec
+++ b/dx-activities-server.spec
@@ -1,6 +1,6 @@
Name: dx-activities-server
Version: 0.1
-Release: 1
+Release: 2
Vendor: Activity Central
Summary: Minimal requirements for hosting an activities update server at schools.
Group: Applications/Internet
@@ -44,5 +44,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Feb 9 2011 Martin Abente. <martin.abente.lahaye@gmail.com>
+- Fix hosts file append and read mode
- First release
diff --git a/setup.py b/setup.py
index 4e68fe6..0a58caf 100755
--- a/setup.py
+++ b/setup.py
@@ -35,8 +35,15 @@ ACTIVITIES_DOMAIN = url_componets.netloc
HOST_FILE = '/etc/hosts'
HTTPD_CONFIG = '/etc/httpd/conf.d'
+VHOST_CONTENT = '''
+<VirtualHost *:80>
+ DocumentRoot %s
+ ServerName %s
+</VirtualHost>
+'''
+
def setup_host():
- host_file = open(HOST_FILE, 'a')
+ host_file = open(HOST_FILE, 'r+')
content = host_file.read()
if content.find(ACTIVITIES_DOMAIN) == -1:
@@ -48,14 +55,9 @@ def setup_httpd_config():
config_path = os.path.join(HTTPD_CONFIG, 'dx-activity-server.conf')
config_file = open(config_path, 'w')
- content = '''
- <VirtualHost *:80>
- DocumentRoot %s
- ServerName %s
- </VirtualHost>
- ''' % (script_path, ACTIVITIES_DOMAIN)
+ config_content = VHOST_CONTENT % (script_path, ACTIVITIES_DOMAIN)
+ config_file.write(config_content)
- config_file.write(content)
config_file.close()
def main():