One setenv to rule them all!

gen_tdp

@@ -12,7 +12,7 @@
 #
 ###############################################################################
 
-CONFIG=./setenv.sh
+CONFIG=./setenv
 
 if [ ! -f "$CONFIG" ]; then
 	echo "Config file does not exist, or not at the location specified.  Please create the file, or correct the location."

makeuser

@@ -13,8 +13,9 @@ EMAIL_TEMPLATE="tmpl/email.tmpl"
 YAML_FILE="$1.yml"
 GEN_TDP="./gen_tdp"
 TILDE_JSON="/var/www/thunix.cf/tilde.json"
+CONFIG=./setenv
 
-. ./setenv
+. $CONFIG
 
 error_exit() {
   echo -e "${PROGNAME}: ${1:-"Unknown Error"}" >&2

setenv

@@ -1,3 +1,9 @@
 # Set location to your repo for ansible here
 # It is only needed for thunix
 export REPO_LOCATION="/home/ubergeek/repos/ansible/"
+export SITE_TITLE="Thunix"
+export SITE="https://thunix.net"
+export WANT_USERS="true"
+export ADMIN_EMAIL="root@thunix.net"
+export SIGNUP_URL="https://thunix.net/signup"
+export DESCRIPTION="Thunix is a community, centered around access to a public *nix system.  Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."

setenv.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Here is where you set config variables.
-
-export SITE_TITLE="Thunix"
-export SITE="https://thunix.net"
-export WANT_USERS="true"
-export ADMIN_EMAIL="root@thunix.net"
-export SIGNUP_URL="https://thunix.net/signup"
-export DESCRIPTION="Thunix is a community, centered around access to a public *nix system.  Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."