Version 1.3

Author: btr1975

Dockerfile

@@ -9,11 +9,14 @@ LABEL maintainer="[email protected]" \
       django-localflavor-version="1.5.1" \
       mysql-python-version="1.2.5"
 
-# Copies the apache conf python script
+# Copies the apache conf python script and shell script
 
 COPY ./apache-site-conf.sh /bin/
+COPY ./apache-site-conf.py /bin/
 
 # Arguments for Apache conf file builder script if not used, they will use default settings
+# Also it will only allow them if there is only one site directory if there
+# is more it will use default, and you will need to modify manually
 # SITE_SERVER_NAME = ServerName
 # SITE_SERVER_ADMIN = ServerAdmin
 
@@ -24,7 +27,8 @@ ARG SITE_SERVER_ADMIN
 
 WORKDIR /DjangoSites
 
-RUN chmod 755 /bin/apache-site-conf.sh
+RUN chmod 755 /bin/apache-site-conf.sh \
+    && chmod 755 /bin/apache-site-conf.py
 
 EXPOSE 80 443
 

README.md

@@ -3,6 +3,7 @@
 ## Created By: Benjamin P. Trachtenberg
 
 ### Contact Information:  [email protected]
+### If you have any questions e-mail me
 
 ### LinkedIn: [Ben Trachtenberg](https://www.linkedin.com/in/ben-trachtenberg-3a78496)
 ### Docker Hub: [Image](https://hub.docker.com/r/btr1975/apache-py2-django/)
@@ -28,11 +29,24 @@ This image is for Python Django Apps written in Python 2
 * MySQL-python: 1.2.5
 * apache-site-conf.py: 1.0.0.prod
 
+### Image Versions in apache-py2-django:1.3
+
+* Python: 2.7.12
+* Apache: 2.4.18 (Ubuntu) with mod_wsgi
+* Django: 1.11.2
+* Django-Localflavor: 1.5.1
+* MySQL-python: 1.2.5
+* apache-site-conf.py: 1.0.1.prod
+* apache-site-conf.sh: 1.0 prod
+
 ### Docker-Image Version Tags
 * latest
 * 1.1
 * 1.2
+* 1.3
 
-#### -- Version News: apache-py2-django:1.2 --
-Added a Python script that builds the apache conf file
+#### -- Version News: apache-py2-django:1.3 --
+Updated Python script that builds the apache conf file
+Added a bash script that builds the apache conf file
+Both scripts do the same thing, so use whichever you want.
 

apache-site-conf.py

@@ -6,28 +6,30 @@
 __credits__ = None
 __license__ = 'The MIT License (MIT)'
 __status__ = 'prod'
-__version_info__ = (1, 0, 0, __status__)
+__version_info__ = (1, 0, 1, __status__)
 __version__ = '.'.join(map(str, __version_info__))
 __maintainer__ = 'Benjamin P. Trachtenberg'
 __email__ = '[email protected]'
 
 
-def create_conf(folder_name):
+def create_conf(folder_name, dir_count):
     """
     Function to create apache conf files for loaded sites
     Currently only non-SSL Sites
-    :param folder_name: The folder name of the site
+    :param
+        folder_name: The folder name of the site
+        dir_count: Count of dirs
     :return:
     """
     temp_list = list()
     temp_list.append('<VirtualHost *:80>')
-    if os.environ.get('SITE_SERVER_NAME'):
+    if os.environ.get('SITE_SERVER_NAME') and dir_count == 1:
         temp_list.append('    ServerName %s' % (os.environ.get('SITE_SERVER_NAME'),))
 
     else:
         temp_list.append('    # ServerName www.example.com')
 
-    if os.environ.get('SITE_SERVER_ADMIN'):
+    if os.environ.get('SITE_SERVER_ADMIN') and dir_count == 1:
         temp_list.append('    ServerAdmin %s' % (os.environ.get('SITE_SERVER_ADMIN'),))
 
     else:
@@ -99,7 +101,22 @@ def add_line_break(list_line):
 
     site_to_enable = output_file(temp_list, folder_name)
 
-    sub.call('a2ensite %s' % (site_to_enable,), stderr=sub.STDOUT, shell=True)
+    sub.call('a2ensite %s > /dev/null' % (site_to_enable,), stderr=sub.STDOUT, shell=True)
+
+
+def count_dir():
+    """
+    Function to count how many dirs in a dir
+    :return:
+        An integer of how many dirs
+    """
+    temp_list_count = list()
+
+    for item_name in os.listdir(os.getcwd()):
+        if os.path.isdir(item_name):
+            temp_list_count.append(item_name)
+
+    return len(temp_list_count)
 
 
 def main():
@@ -108,11 +125,13 @@ def main():
     :return: None
 
     """
+    dir_count = count_dir()
+
     for item_name in os.listdir(os.getcwd()):
         if os.path.isdir(item_name):
-            create_conf(item_name)
+            create_conf(item_name, dir_count)
 
-    sub.call('a2dissite 000-default.conf', stderr=sub.STDOUT, shell=True)
+    sub.call('a2dissite 000-default.conf > /dev/null', stderr=sub.STDOUT, shell=True)
 
 
 main()

apache-site-conf.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # This script is to build apache conf files for Django apps
-# Version: 1.0 Dev
+# Version: 1.0 Prod
 # Author: Benjamin P. Trachtenberg
 # Contact: [email protected]
 
-apachedirname="/etc/apache2/sites-available"
+declare -r apachedirname="/etc/apache2/sites-available"
 apacheconfname=""
-djangodirname="/DjangoSites"
+declare -r djangodirname="/DjangoSites"
 
 # Check for DjangoSites Directory
 if [[ ! -d $djangodirname ]]; then
@@ -31,8 +31,23 @@ for directory in $(ls $djangodirname); do
         if [[ ! -f "$apachedirname/$apacheconfname" ]]; then
             echo "Creating apache config $apachedirname/$apacheconfname"
             echo "<VirtualHost *:80>" >> $apachedirname/$apacheconfname
-            echo " # ServerName www.example.com" >> $apachedirname/$apacheconfname
-            echo " ServerAdmin webmaster@localhost" >> $apachedirname/$apacheconfname
+
+            if [[ $(ls -d $djangodirname/*/ | wc -l) = 1 && $SITE_SERVER_NAME ]]; then
+                echo " ServerName $SITE_SERVER_NAME" >> $apachedirname/$apacheconfname
+
+            else
+                echo " # ServerName www.example.com" >> $apachedirname/$apacheconfname
+
+            fi
+
+            if [[ $(ls -d $djangodirname/*/ | wc -l) = 1 && $SITE_SERVER_ADMIN ]]; then
+                echo " ServerAdmin $SITE_SERVER_ADMIN" >> $apachedirname/$apacheconfname
+
+            else
+                echo " ServerAdmin webmaster@localhost" >> $apachedirname/$apacheconfname
+
+            fi
+
             echo "" >> $apachedirname/$apacheconfname
             echo " Alias /media/ /DjangoSites/$directory/media/" >> $apachedirname/$apacheconfname
             echo "" >> $apachedirname/$apacheconfname