Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tweaks
  • Loading branch information
symkat committed Dec 6, 2021
1 parent 1c8ed61 commit cdd4442
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
9 changes: 6 additions & 3 deletions .docker/blogdb.yml
Expand Up @@ -4,7 +4,7 @@ services:
webserver:
image: symkat/blogdb:latest
ports:
- 8000:3000
- 80:3000
container_name: blogdb-webserver
environment:
# Configuration for perl
Expand All @@ -23,6 +23,7 @@ services:

volumes:
- ./Web:/home/app/BlogDB
- blogdb_staticfs:/home/app/BlogDB/public
working_dir: /home/app/BlogDB
command: ./script/blogdb_web daemon
depends_on:
Expand All @@ -39,14 +40,15 @@ services:
PERL_LOCAL_LIB_ROOT: '/home/app/perl5'
# Configuration For The App
BDB_CONFIG_FILE: 'blogdb.docker.yml'
WC_SCREENSHOT_URL: 'http://screenshot:5000'
WC_SCREENSHOT_URL: 'http://screenshot:3000'
BDB_MINION_DB: 'postgresql://minion:minion@miniondb/minion'
BDB_DEFAULT_DB: 'postgresql://blogdb:blogdb@database/blogdb'
BDB_DOCKER_HOST_WAIT: 1,
BDB_DHW_MINION_HOST: 'miniondb'
BDB_DHW_DEFAULT_HOST: 'database'
volumes:
- ./Web:/home/app/BlogDB
- blogdb_staticfs:/home/app/BlogDB/public
working_dir: /home/app/BlogDB
command: ./script/blogdb_web minion worker
depends_on:
Expand Down Expand Up @@ -78,4 +80,5 @@ services:

volumes:
blogdb_database:
minion_database:
blogdb_staticfs:
minion_database:
1 change: 0 additions & 1 deletion Web/blogdb.docker.yml
Expand Up @@ -7,7 +7,6 @@ database:
minion: <%= $ENV{BDB_MINION_DB} %>

template_dir: simple
screenshot_dir: /home/app/BlogDB/static/blog_screenshots/

ws_screenshot:
base_url: <%= $ENV{WC_SCREENSHOT_URL} %>
Expand Down
25 changes: 13 additions & 12 deletions Web/templates/simple/index.html.tx
Expand Up @@ -27,16 +27,17 @@
%% }
%% }

<nav aria-label="Pagination">
<hr class="my-0" />
<ul class="pagination justify-content-center my-4">
<li class="page-item disabled"><a class="page-link" href="#" tabindex="-1" aria-disabled="true">Newer</a></li>
<li class="page-item active" aria-current="page"><a class="page-link" href="#!">1</a></li>
<li class="page-item"><a class="page-link" href="#!">2</a></li>
<li class="page-item"><a class="page-link" href="#!">3</a></li>
<li class="page-item disabled"><a class="page-link" href="#!">...</a></li>
<li class="page-item"><a class="page-link" href="#!">15</a></li>
<li class="page-item"><a class="page-link" href="#!">Older</a></li>
</ul>
</nav>
%%# <nav aria-label="Pagination">
%%# <hr class="my-0" />
%%# <ul class="pagination justify-content-center my-4">
%%# <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1" aria-disabled="true">Newer</a></li>
%%# <li class="page-item active" aria-current="page"><a class="page-link" href="#!">1</a></li>
%%# <li class="page-item"><a class="page-link" href="#!">2</a></li>
%%# <li class="page-item"><a class="page-link" href="#!">3</a></li>
%%# <li class="page-item disabled"><a class="page-link" href="#!">...</a></li>
%%# <li class="page-item"><a class="page-link" href="#!">15</a></li>
%%# <li class="page-item"><a class="page-link" href="#!">Older</a></li>
%%# </ul>
%%# </nav>

%% }

0 comments on commit cdd4442

Please sign in to comment.