ongoing work on #34 #39

.gitignore

@@ -34,3 +34,6 @@ buildNumber.properties
 /nbdist/
 /.nb-gradle/
 
+### Apllication ####
+conf.sh
+

_config.yml

@@ -1 +1,4 @@
-theme: jekyll-theme-slate
+theme: jekyll-theme-slate
+title: defcon1
+description: I am fuckep up by visitung my favorite web page an finding commentaries containing the hardest nazi hatespeech.
+google_analytics: UA-17174370-7

build.sh

@@ -2,8 +2,6 @@
 
 source conf.sh
 
-export MAVEN_OPTS="-Xmx512m"
-
 ./mvnw -e clean install dependency:tree site
 
 exit 0

conf.sample.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+export DEFCON1_LOGIN_USERNAME=nbc
+export DEFCON1_LOGIN_PASSWORD=natural-born-coder
+
+# TODO
+export DEFCON1_GOOGLE_APS_API_KEY=****
+
+# TODO
+export DEFCON1_GOOGLE_ANALYTICS_ID=****
+
+# TODO
+export DEFCON1_GOOGLE_WEBMASTER_TOOLS_ID=***
+
+# TODO
+export DEFCON1_MICROSOFT_WEBMASTER_TOOLS_ID=****
+
+# TODO
+export DEFCON1_FACEBOOK_APP_ID=******
+
+# TODO
+export DEFCON1_TWITTER_CARD_SITE=port80guru
+
+# TODO
+export DEFCON1_TWITTER_CARD_CREATOR=port80guru
+
+export DEFCON1_PROFILE_DEFAULT='-Pdefault'
+export DEFCON1_PROFILE_DEV_embedded='-Pdevembedded'
+export DEFCON1_PROFILE_INT_embedded='-Pintembedded'
+export DEFCON1_PROFILE_TEST_embedded='-Ptestembedded'
+export DEFCON1_PROFILE_PROD_embedded='-Pprodembedded'
+export DEFCON1_PROFILE_TRAVIS_embedded='-Ptravisembedded'
+export DEFCON1_PROFILE_DEV='-Pdev'
+export DEFCON1_PROFILE_INT='-Pint'
+export DEFCON1_PROFILE_TEST='-Ptest'
+export DEFCON1_PROFILE_PROD='-Pprod'
+export DEFCON1_PROFILE_TRAVIS='-Ptravis'
+
+export DEFCON1_PROFILE_RUN=$DEFCON1_PROFILE_DEFAULT
+export DEFCON1_PROFILE_RELEASE=$DEFCON1_PROFILE_TEST_embedded
+export DEFCON1_PROFILE_BUILD_JAR=$DEFCON1_PROFILE_DEFAULT
+
+# TODO
+export DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU=''
+
+export MAVEN_OPTS="-Xmx512m"
+export PORT=8080
+export JAVA_OPTS='-Xmx350m -Xss512k'
+

conf.sh

@@ -1,24 +1,34 @@
 #!/usr/bin/env bash
 
-export BTW17_LOGIN_USERNAME=nbc
-export BTW17_LOGIN_PASSWORD=natural-born-coder
-export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
-export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
-export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
-export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
-export BTW17_FACEBOOK_APP_ID=1721279777913278
-export BTW17_TWITTER_CARD_SITE=port80guru
-export BTW17_TWITTER_CARD_CREATOR=port80guru
+export DEFCON1_LOGIN_USERNAME=nbc
+export DEFCON1_LOGIN_PASSWORD=natural-born-coder
+export DEFCON1_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
+export DEFCON1_GOOGLE_ANALYTICS_ID=UA-17174370-11
+export DEFCON1_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
+export DEFCON1_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
+export DEFCON1_FACEBOOK_APP_ID=1721279777913278
+export DEFCON1_TWITTER_CARD_SITE=port80guru
+export DEFCON1_TWITTER_CARD_CREATOR=port80guru
 
-export DEFCON1_PROFILE='-Pdefault'
-#export DEFCON1_PROFILE='-Pdevembedded'
-#export DEFCON1_PROFILE='-Pintembedded'
-#export DEFCON1_PROFILE='-Ptestembedded'
-#export DEFCON1_PROFILE='-Pprodembedded'
-#export DEFCON1_PROFILE='-Ptravisembedded'
-#export DEFCON1_PROFILE='-Pdev'
-#export DEFCON1_PROFILE='-Pint'
-#export DEFCON1_PROFILE='-Ptest'
-#export DEFCON1_PROFILE='-Pprod'
-#export DEFCON1_PROFILE='-Ptravis'
+export DEFCON1_PROFILE_DEFAULT='-Pdefault'
+export DEFCON1_PROFILE_DEV_embedded='-Pdevembedded'
+export DEFCON1_PROFILE_INT_embedded='-Pintembedded'
+export DEFCON1_PROFILE_TEST_embedded='-Ptestembedded'
+export DEFCON1_PROFILE_PROD_embedded='-Pprodembedded'
+export DEFCON1_PROFILE_TRAVIS_embedded='-Ptravisembedded'
+export DEFCON1_PROFILE_DEV='-Pdev'
+export DEFCON1_PROFILE_INT='-Pint'
+export DEFCON1_PROFILE_TEST='-Ptest'
+export DEFCON1_PROFILE_PROD='-Pprod'
+export DEFCON1_PROFILE_TRAVIS='-Ptravis'
+
+export DEFCON1_PROFILE_RUN=$DEFCON1_PROFILE_DEFAULT
+export DEFCON1_PROFILE_RELEASE=$DEFCON1_PROFILE_TEST_embedded
+export DEFCON1_PROFILE_BUILD_JAR=$DEFCON1_PROFILE_DEFAULT
+# TODO
+export DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU=''
+
+export MAVEN_OPTS="-Xmx512m"
+export PORT=8080
+export JAVA_OPTS='-Xmx350m -Xss512k'
 

heroku.sh

@@ -2,14 +2,8 @@
 
 source conf.sh
 
-export PORT=8080
-export JAVA_OPTS='-Xmx350m -Xss512k'
+./mvnw $DEFCON1_PROFILE_BUILD_JAR clean install
 
-export DATASOURCE_URL='jdbc:postgresql://localhost:5432/kandidatenheroku?user=kandidatenheroku&password=kandidatenherokupwd'
-
-export DATASOURCE_USERNAME=kandidatenheroku
-export DATASOURCE_PASSWORD=kandidatenherokupwd
-
-./mvnw clean install
+# TODO: $DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU
 
 java -Dserver.port=$PORT $JAVA_OPTS -jar target/kandidaten-2.0.1-SNAPSHOT.jar

release.sh

@@ -3,14 +3,7 @@
 
 source conf.sh
 
-export DATASOURCE_URL='jdbc:postgresql://localhost:5432/kandidatenrelease?user=kandidatenrelease&password=kandidatenreleasepwd'
-
-export DATASOURCE_USERNAME=kandidatenrelease
-export DATASOURCE_PASSWORD=kandidatenreleasepwd
-
-export BTW17_JPA_HIBERNATE_DDL_AUTO=update
-
-./mvnw clean install
+./mvnw $DEFCON1_PROFILE_RELEASE clean install
 
 ./mvnw clean spring-boot:run
 

run.sh

@@ -4,6 +4,6 @@ source conf.sh
 
 export JAVA_OPTIONS='-Xmx300m -Xss512k -Dfile.encoding=UTF-8'
 
-./mvnw clean spring-boot:run
+./mvnw $DEFCON1_PROFILE_RUN clean spring-boot:run
 
 exit 0