Skip to content

Commit 1fd2410

Browse files
author
phasenraum2010
committed
ongoing work on #34 #39
1 parent 0daadec commit 1fd2410

File tree

8 files changed

+90
-40
lines changed

8 files changed

+90
-40
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ buildNumber.properties
3434
/nbdist/
3535
/.nb-gradle/
3636

37+
### Apllication ####
38+
conf.sh
39+

_config.yml

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

build.sh

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
source conf.sh
44

5-
export MAVEN_OPTS="-Xmx512m"
6-
75
./mvnw -e clean install dependency:tree site
86

97
exit 0

conf.sample.sh

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
3+
export DEFCON1_LOGIN_USERNAME=nbc
4+
export DEFCON1_LOGIN_PASSWORD=natural-born-coder
5+
6+
# TODO
7+
export DEFCON1_GOOGLE_APS_API_KEY=****
8+
9+
# TODO
10+
export DEFCON1_GOOGLE_ANALYTICS_ID=****
11+
12+
# TODO
13+
export DEFCON1_GOOGLE_WEBMASTER_TOOLS_ID=***
14+
15+
# TODO
16+
export DEFCON1_MICROSOFT_WEBMASTER_TOOLS_ID=****
17+
18+
# TODO
19+
export DEFCON1_FACEBOOK_APP_ID=******
20+
21+
# TODO
22+
export DEFCON1_TWITTER_CARD_SITE=port80guru
23+
24+
# TODO
25+
export DEFCON1_TWITTER_CARD_CREATOR=port80guru
26+
27+
export DEFCON1_PROFILE_DEFAULT='-Pdefault'
28+
export DEFCON1_PROFILE_DEV_embedded='-Pdevembedded'
29+
export DEFCON1_PROFILE_INT_embedded='-Pintembedded'
30+
export DEFCON1_PROFILE_TEST_embedded='-Ptestembedded'
31+
export DEFCON1_PROFILE_PROD_embedded='-Pprodembedded'
32+
export DEFCON1_PROFILE_TRAVIS_embedded='-Ptravisembedded'
33+
export DEFCON1_PROFILE_DEV='-Pdev'
34+
export DEFCON1_PROFILE_INT='-Pint'
35+
export DEFCON1_PROFILE_TEST='-Ptest'
36+
export DEFCON1_PROFILE_PROD='-Pprod'
37+
export DEFCON1_PROFILE_TRAVIS='-Ptravis'
38+
39+
export DEFCON1_PROFILE_RUN=$DEFCON1_PROFILE_DEFAULT
40+
export DEFCON1_PROFILE_RELEASE=$DEFCON1_PROFILE_TEST_embedded
41+
export DEFCON1_PROFILE_BUILD_JAR=$DEFCON1_PROFILE_DEFAULT
42+
43+
# TODO
44+
export DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU=''
45+
46+
export MAVEN_OPTS="-Xmx512m"
47+
export PORT=8080
48+
export JAVA_OPTS='-Xmx350m -Xss512k'
49+

conf.sh

+30-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
11
#!/usr/bin/env bash
22

3-
export BTW17_LOGIN_USERNAME=nbc
4-
export BTW17_LOGIN_PASSWORD=natural-born-coder
5-
export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
6-
export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
7-
export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
8-
export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
9-
export BTW17_FACEBOOK_APP_ID=1721279777913278
10-
export BTW17_TWITTER_CARD_SITE=port80guru
11-
export BTW17_TWITTER_CARD_CREATOR=port80guru
3+
export DEFCON1_LOGIN_USERNAME=nbc
4+
export DEFCON1_LOGIN_PASSWORD=natural-born-coder
5+
export DEFCON1_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
6+
export DEFCON1_GOOGLE_ANALYTICS_ID=UA-17174370-11
7+
export DEFCON1_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
8+
export DEFCON1_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
9+
export DEFCON1_FACEBOOK_APP_ID=1721279777913278
10+
export DEFCON1_TWITTER_CARD_SITE=port80guru
11+
export DEFCON1_TWITTER_CARD_CREATOR=port80guru
1212

13-
export DEFCON1_PROFILE='-Pdefault'
14-
#export DEFCON1_PROFILE='-Pdevembedded'
15-
#export DEFCON1_PROFILE='-Pintembedded'
16-
#export DEFCON1_PROFILE='-Ptestembedded'
17-
#export DEFCON1_PROFILE='-Pprodembedded'
18-
#export DEFCON1_PROFILE='-Ptravisembedded'
19-
#export DEFCON1_PROFILE='-Pdev'
20-
#export DEFCON1_PROFILE='-Pint'
21-
#export DEFCON1_PROFILE='-Ptest'
22-
#export DEFCON1_PROFILE='-Pprod'
23-
#export DEFCON1_PROFILE='-Ptravis'
13+
export DEFCON1_PROFILE_DEFAULT='-Pdefault'
14+
export DEFCON1_PROFILE_DEV_embedded='-Pdevembedded'
15+
export DEFCON1_PROFILE_INT_embedded='-Pintembedded'
16+
export DEFCON1_PROFILE_TEST_embedded='-Ptestembedded'
17+
export DEFCON1_PROFILE_PROD_embedded='-Pprodembedded'
18+
export DEFCON1_PROFILE_TRAVIS_embedded='-Ptravisembedded'
19+
export DEFCON1_PROFILE_DEV='-Pdev'
20+
export DEFCON1_PROFILE_INT='-Pint'
21+
export DEFCON1_PROFILE_TEST='-Ptest'
22+
export DEFCON1_PROFILE_PROD='-Pprod'
23+
export DEFCON1_PROFILE_TRAVIS='-Ptravis'
24+
25+
export DEFCON1_PROFILE_RUN=$DEFCON1_PROFILE_DEFAULT
26+
export DEFCON1_PROFILE_RELEASE=$DEFCON1_PROFILE_TEST_embedded
27+
export DEFCON1_PROFILE_BUILD_JAR=$DEFCON1_PROFILE_DEFAULT
28+
# TODO
29+
export DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU=''
30+
31+
export MAVEN_OPTS="-Xmx512m"
32+
export PORT=8080
33+
export JAVA_OPTS='-Xmx350m -Xss512k'
2434

heroku.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22

33
source conf.sh
44

5-
export PORT=8080
6-
export JAVA_OPTS='-Xmx350m -Xss512k'
5+
./mvnw $DEFCON1_PROFILE_BUILD_JAR clean install
76

8-
export DATASOURCE_URL='jdbc:postgresql://localhost:5432/kandidatenheroku?user=kandidatenheroku&password=kandidatenherokupwd'
9-
10-
export DATASOURCE_USERNAME=kandidatenheroku
11-
export DATASOURCE_PASSWORD=kandidatenherokupwd
12-
13-
./mvnw clean install
7+
# TODO: $DEFCON1_PROFILE_RUN_JAR_LIKE_HEROKU
148

159
java -Dserver.port=$PORT $JAVA_OPTS -jar target/kandidaten-2.0.1-SNAPSHOT.jar

release.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33

44
source conf.sh
55

6-
export DATASOURCE_URL='jdbc:postgresql://localhost:5432/kandidatenrelease?user=kandidatenrelease&password=kandidatenreleasepwd'
7-
8-
export DATASOURCE_USERNAME=kandidatenrelease
9-
export DATASOURCE_PASSWORD=kandidatenreleasepwd
10-
11-
export BTW17_JPA_HIBERNATE_DDL_AUTO=update
12-
13-
./mvnw clean install
6+
./mvnw $DEFCON1_PROFILE_RELEASE clean install
147

158
./mvnw clean spring-boot:run
169

run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source conf.sh
44

55
export JAVA_OPTIONS='-Xmx300m -Xss512k -Dfile.encoding=UTF-8'
66

7-
./mvnw clean spring-boot:run
7+
./mvnw $DEFCON1_PROFILE_RUN clean spring-boot:run
88

99
exit 0

0 commit comments

Comments
 (0)