Rename pechtold to cupido, rename juncker to kantklosser.

GeenPeil · Apr 1, 2018 · 308ecf1 · 308ecf1
1 parent 7aa7602
commit 308ecf1
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,5 @@
 
 /storage/testdata/*
-/juncker/testfile.pdf
-
-/pechtold/pechtold
-/juncker/juncker
-/stresser/stresser
+/kantklosser/testfile.pdf
 
 dist
diff --git a/Makefile b/Makefile
@@ -1,8 +1,12 @@
 
 .PHONY: build
-build: build-pechtold
+build: build-cupido build-kantklosser
 
 
-.PHONY: build-pechtold
-build-pechtold:
-	go build -o dist/bin/pechtold github.com/GeenPeil/teken/pechtold
+.PHONY: build-cupido
+build-cupido:
+	go build -o dist/bin/cupido github.com/GeenPeil/teken/cupido/cmd/cupido
+
+.PHONY: build-kantklosser
+build-kantklosser:
+	go build -o dist/bin/kantklosser github.com/GeenPeil/teken/kantklosser
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 
 [![Project structuur](docs/structuur.png)](https://raw.githubusercontent.com/GeenPeil/teken/master/docs/structuur.png)
 
-### pechtold - API server (http api, encryption, storage)
+### cupido - API server (http api, encryption, storage)
 
 #### API
 
-pechtold draait een HTTP API waarmee nieuwe handtekeningen kunnen worden opgeslagen op de server, om op een later tijdstip uitgeprint te worden.
+cupido draait een HTTP API waarmee nieuwe handtekeningen kunnen worden opgeslagen op de server, om op een later tijdstip uitgeprint te worden.
 
 Voor het opslaan van de gegevens is slechts een simpele HTTP POST call nodig, met in de body JSON data. De JSON data is een object met de volgende velden:
 
@@ -59,6 +59,6 @@ Om dubbele uploads te herkennen word er twee sha256 hashes gemaakt en opgeslagen
 Database structuur: *(`.dbm` file in docs is te bewerken met pgmodeler)*
 [![Database geenpeil](docs/database-geenpeil.png)](https://raw.githubusercontent.com/GeenPeil/teken/master/docs/database-geenpeil.png)
 
-### juncker - printing application (decryption, pdf rendering)
+### kantklosser - printing application (decryption, pdf rendering)
 
-juncker converteert encrypted data naar printbare pdf's. juncker verwacht daarbij dezelfde directory structure waarmee pechtold opslaat.
+kantklosser converteert encrypted data naar printbare pdf's. kantklosser verwacht daarbij dezelfde directory structure waarmee cupido opslaat.
diff --git a/pechtold/main.go → cupido/cmd/cupido/main.go b/pechtold/main.go → cupido/cmd/cupido/main.go
@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/GeenPeil/teken/pechtold/server"
+	"github.com/GeenPeil/teken/cupido"
 
 	goflags "github.com/jessevdk/go-flags"
 )
 
 func main() {
 
-	flags := &server.Options{}
+	flags := &cupido.Options{}
 
 	parser := goflags.NewParser(flags, goflags.HelpFlag|goflags.PrintErrors)
 
@@ -40,6 +40,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	s := server.New(flags)
+	s := cupido.New(flags)
 	s.Run(nil)
 }
diff --git a/pechtold/server/health.go → cupido/health.go b/pechtold/server/health.go → cupido/health.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import "net/http"
 

diff --git a/pechtold/server/options.go → cupido/options.go b/pechtold/server/options.go → cupido/options.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 // Options is used to create a new server instance.
 // It's meant to be used with github.com/jessevdk/go-flags, but is seperated from the actual parsing to allow overrides in tests and benchmarks.

diff --git a/pechtold/server/outputtypes.go → cupido/outputtypes.go b/pechtold/server/outputtypes.go → cupido/outputtypes.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 //go:generate ffjson -nodecoder $GOFILE
 

diff --git a/pechtold/server/outputtypes_ffjson.go → cupido/outputtypes_ffjson.go b/pechtold/server/outputtypes_ffjson.go → cupido/outputtypes_ffjson.go
diff --git a/pechtold/server/server.go → cupido/server.go b/pechtold/server/server.go → cupido/server.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"crypto/rand"
@@ -48,17 +48,17 @@ func New(o *Options) *Server {
 	return s
 }
 
-// Run is a forever blocking call that starts the pechtold server.
+// Run is a forever blocking call that starts the cupido server.
 // When setupDoneCh is not nil, it is closed by Run when most of the setup is done and the http server is started (blocking).
 func (s *Server) Run(setupDoneCh chan struct{}) {
 	s.setupDB()
 
 	s.setupCaptcha()
 
-	http.HandleFunc("/pechtold/submit", s.newSubmitHandlerFunc())
-	http.HandleFunc("/pechtold/verify", s.newVerifyHandlerFunc())
-	http.HandleFunc("/pechtold/health-check", s.newHealthCheckHandlerFunc())
-	http.HandleFunc("/pechtold/api/stats", s.newAPIStatsHandlerFunc())
+	http.HandleFunc("/cupido/submit", s.newSubmitHandlerFunc())
+	http.HandleFunc("/cupido/verify", s.newVerifyHandlerFunc())
+	http.HandleFunc("/cupido/health-check", s.newHealthCheckHandlerFunc())
+	http.HandleFunc("/cupido/api/stats", s.newAPIStatsHandlerFunc())
 
 	if setupDoneCh != nil {
 		close(setupDoneCh)
@@ -72,7 +72,7 @@ func (s *Server) Run(setupDoneCh chan struct{}) {
 
 func (s *Server) setupDB() {
 	var err error
-	s.db, err = sql.Open("postgres", fmt.Sprintf("host=%s sslmode=disable user=pechtold password=pechtold dbname=geenpeil", s.options.PostgresSocketLocation))
+	s.db, err = sql.Open("postgres", fmt.Sprintf("host=%s sslmode=disable user=cupido password=cupido dbname=geenpeil", s.options.PostgresSocketLocation))
 	if err != nil {
 		log.Fatalf("error setting up db conn (open): %v", err)
 	}

diff --git a/pechtold/server/server_test.go → cupido/server_test.go b/pechtold/server/server_test.go → cupido/server_test.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"bytes"
@@ -46,7 +46,7 @@ func TestServer(t *testing.T) {
 		t.Fatalf("error creating test JSON data: %v", err)
 	}
 
-	resp, err := http.Post("http://localhost:8080/pechtold/submit", "application/json", bytes.NewBuffer(handtekeningJSON))
+	resp, err := http.Post("http://localhost:8080/cupido/submit", "application/json", bytes.NewBuffer(handtekeningJSON))
 	if err != nil {
 		t.Fatalf("error making upload request: %v", err)
 	}

diff --git a/pechtold/server/stats.go → cupido/stats.go b/pechtold/server/stats.go → cupido/stats.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"encoding/json"

diff --git a/pechtold/server/submit.go → cupido/submit.go b/pechtold/server/submit.go → cupido/submit.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"bytes"
@@ -276,7 +276,7 @@ func (s *Server) newSubmitHandlerFunc() http.HandlerFunc {
 			// send mail
 			md := &mailData{
 				Naam:            toNaam,
-				VerificatieLink: fmt.Sprintf("https://teken.geenpeil.nl/pechtold/verify?mailhash=%s&check=%s", base64.URLEncoding.EncodeToString(mailHashBytes), mailCheck),
+				VerificatieLink: fmt.Sprintf("https://teken.geenpeil.nl/cupido/verify?mailhash=%s&check=%s", base64.URLEncoding.EncodeToString(mailHashBytes), mailCheck),
 			}
 			var bodyBuf = &bytes.Buffer{}
 			err = tmplVerificationMailPlainText.Execute(bodyBuf, md)

diff --git a/pechtold/server/util.go → cupido/util.go b/pechtold/server/util.go → cupido/util.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"math/rand"

diff --git a/pechtold/server/verify.go → cupido/verify.go b/pechtold/server/verify.go → cupido/verify.go
@@ -1,4 +1,4 @@
-package server
+package cupido
 
 import (
 	"bytes"
@@ -32,7 +32,7 @@ var (
 			}
 			.logo{
 				display: inline-block;
-				background-image: url(/pechtold-static/geenpeillogo.png);
+				background-image: url(/cupido-static/geenpeillogo.png);
 				background-size: cover;
 				width: 55px;
 				height: 55px;
@@ -82,7 +82,7 @@ var (
 			<h1><div class="logo"></div><span class="logo-text">GEENPEIL</span></h1>
 			<h3>{{.Text}}</h3>
 			{{if .Verdrietig}}
-				<img src="/pechtold-static/verdrietig.jpg" />
+				<img src="/cupido-static/verdrietig.jpg" />
 			{{end}}
 			<br/>
 			<div class="geenpeil-share">

diff --git a/docs/database-create-user.sql b/docs/database-create-user.sql
@@ -1,13 +1,13 @@
 
-CREATE ROLE pechtold PASSWORD 'md55279b99979be20e5f546f4ba96239112' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;
+CREATE ROLE cupido PASSWORD 'md55279b99979be20e5f546f4ba96239112' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;
 
-GRANT CONNECT ON DATABASE geenpeil TO pechtold;
+GRANT CONNECT ON DATABASE geenpeil TO cupido;
 
-GRANT SELECT, INSERT ON ALL TABLES IN SCHEMA public TO pechtold;
+GRANT SELECT, INSERT ON ALL TABLES IN SCHEMA public TO cupido;
 
-GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO pechtold;
+GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO cupido;
 
 # for testing: edit pg_hba.conf to allow md5 auth for local unix socket connections
 
-# for prod: run pechtold as user pechtold (system user)
+# for prod: run cupido as user cupido (system user)
 
diff --git a/frontend/geenpeil-ember/app/controllers/check.js b/frontend/geenpeil-ember/app/controllers/check.js
@@ -42,7 +42,7 @@ export default Ember.Controller.extend({
       // Send the data
       Ember.$.ajax({
         type : 'POST',
-        url: 'https://teken.geenpeil.nl/pechtold/submit',
+        url: 'https://teken.geenpeil.nl/cupido/submit',
         data : JSON.stringify(message),
         contentType : 'application/json',
         error : function(e) {

diff --git a/frontend/geenpeil-ember/app/index.html b/frontend/geenpeil-ember/app/index.html
@@ -12,7 +12,7 @@
     <meta property="og:type" content="website">
     <meta property="og:title" content="GEENPEIL | Red de democratie!">
     <meta property="og:description" content="We hebben 300.000 handtekeningen nodig om een officieel referendum aan te vragen. Dus dat gaan we doen. Met jouw hulp. Zet je handtekening via deze app! Like, share en win een heus referendum :)">
-    <meta property="og:image" content="https://teken.geenpeil.nl/pechtold-static/geenpeillogo.png">
+    <meta property="og:image" content="https://teken.geenpeil.nl/cupido-static/geenpeillogo.png">
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@geenstijl">
     <meta name="twitter:title" content="GEENPEIL | Red de democratie!">

diff --git a/frontend/geenpeil-ember/app/routes/application.js b/frontend/geenpeil-ember/app/routes/application.js
@@ -9,7 +9,7 @@ export default Ember.Route.extend({
       if(transition.targetName !== 'down') {
         return Ember.$.ajax({
           type : 'GET',
-          url: 'https://teken.geenpeil.nl/pechtold/health-check',
+          url: 'https://teken.geenpeil.nl/cupido/health-check',
           success : function(d) {
             console.log('health check success:',d);
           }.bind(this),

diff --git a/juncker/forms/definitief.jpg → kantklosser/forms/definitief.jpg b/juncker/forms/definitief.jpg → kantklosser/forms/definitief.jpg
diff --git a/juncker/main.go → kantklosser/main.go b/juncker/main.go → kantklosser/main.go
diff --git a/juncker/options.go → kantklosser/options.go b/juncker/options.go → kantklosser/options.go
diff --git a/juncker/pdf.go → kantklosser/pdf.go b/juncker/pdf.go → kantklosser/pdf.go
diff --git a/stresser/main.go b/stresser/main.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/GeenPeil/teken/cupido/server"
 	"github.com/GeenPeil/teken/data"
-	"github.com/GeenPeil/teken/pechtold/server"
 )
 
 const workers = 800
@@ -56,7 +56,7 @@ func main() {
 					log.Fatalf("error creating test JSON data: %v", err)
 				}
 
-				resp, err := http.Post("http://localhost:8080/pechtold/submit", "application/json", bytes.NewBuffer(handtekeningJSON))
+				resp, err := http.Post("http://localhost:8080/cupido/submit", "application/json", bytes.NewBuffer(handtekeningJSON))
 				if err != nil {
 					log.Fatalf("error making upload request: %v", err)
 				}