Skip to content

mv server/vmap/trillian_map_server -> server/trillian_map_server #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gdbelvin merged 2 commits into from
May 26, 2017
Merged

mv server/vmap/trillian_map_server -> server/trillian_map_server #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9aab56
mv server/vmap/trillian_map_server -> server/trillian_map_server
gdbelvin May 24, 2017
4c7ba0a
Fix integration tests
gdbelvin May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/ct/ctmapper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ which have that domain in their subject/SAN fields.
# contents of storage/mysql/storage.sql
yes | scripts/resetdb.sh

go build ./server/vmap/trillian_map_server
go build ./server/trillian_map_server
go build ./examples/ct/ctmapper/mapper
go build ./examples/ct/ctmapper/lookup

Expand Down
2 changes: 1 addition & 1 deletion integration/map_integration_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ INTEGRATION_DIR="$( cd "$( dirname "$0" )" && pwd )"

echo "Building code"
go build ${GOFLAGS} github.com/google/trillian/cmd/createtree/
go build ${GOFLAGS} github.com/google/trillian/server/vmap/trillian_map_server/
go build ${GOFLAGS} github.com/google/trillian/server/trillian_map_server/

yes | "${GOPATH}"/src/github.com/google/trillian/scripts/resetdb.sh

Expand Down
2 changes: 1 addition & 1 deletion server/vmap/trillian_map_server.go → server/trillian_map_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package vmap
package server

import (
"time"
Expand Down
2 changes: 1 addition & 1 deletion server/vmap/trillian_map_server/Dockerfile → server/trillian_map_server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV HOST=0.0.0.0 \
ADD . /go/src/github.com/google/trillian
WORKDIR /go/src/github.com/google/trillian

RUN go get ./server/vmap/trillian_map_server
RUN go get ./server/trillian_map_server

ENTRYPOINT /go/bin/trillian_map_server \
--mysql_uri="${DB_USER}:${DB_PASSWORD}@tcp(${DB_HOST})/${DB_DATABASE}" \
Expand Down
3 changes: 1 addition & 2 deletions server/vmap/trillian_map_server/main.go → server/trillian_map_server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
mysqlq "github.com/google/trillian/quota/mysql"
"github.com/google/trillian/server"
"github.com/google/trillian/server/interceptor"
"github.com/google/trillian/server/vmap"
"github.com/google/trillian/storage/mysql"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"google.golang.org/grpc"
Expand Down Expand Up @@ -83,7 +82,7 @@ func main() {
return nil
},
RegisterServerFn: func(s *grpc.Server, registry extension.Registry) error {
mapServer := vmap.NewTrillianMapServer(registry)
mapServer := server.NewTrillianMapServer(registry)
if err := mapServer.IsHealthy(); err != nil {
return err
}
Expand Down