Skip to content
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

Jump to bottom

Rewrite Geoblock (use new mmdb) #2675

Merged
merged 27 commits into from
Sep 19, 2024
Merged

Rewrite Geoblock (use new mmdb) #2675

merged 27 commits into from
Sep 19, 2024

Commits on Sep 17, 2024

  1. Rewrite Geoblock (use new mmdb) 

    @szaimen @aaaskew  Please test this PR. Please note it requires some new functions, please see the lib file in this PR.

Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    cf38b6c View commit details
    Browse the repository at this point in the history

  2. update lib with new functions 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    cb2661f View commit details
    Browse the repository at this point in the history

  3. SC 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a9b9f2a View commit details
    Browse the repository at this point in the history

  4. SC 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6fc37cc View commit details
    Browse the repository at this point in the history

  5. use exisitng function 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6427270 View commit details
    Browse the repository at this point in the history

  6. update script fixes 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    326e0db View commit details
    Browse the repository at this point in the history

  7. revert to simple docker rm 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    72171c3 View commit details
    Browse the repository at this point in the history

  8. change lilnk 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6d90f2e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into geoblock-v2

    @enoch85
    enoch85 authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    27346fa View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. misc 

    Added logging (not working yet)
Changed to file instead of directly in Apache2
temporary changed source (for testing)

Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    1cb2a8f View commit details
    Browse the repository at this point in the history

  2. logging now works 

    ... but it's not logging blocked attempts yet.

Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7a49af2 View commit details
    Browse the repository at this point in the history

  3. add "$GEOBLOCK_MOD_CONF" 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    34e4c66 View commit details
    Browse the repository at this point in the history

  4. replace against $variable 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    04ea7ac View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. install module 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    56e8a9a View commit details
    Browse the repository at this point in the history

  2. make it conf instead of load 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    1117639 View commit details
    Browse the repository at this point in the history

  3. everything is working! 

    tested on Ubuntu 22.04 and 24.04

Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    24590c7 View commit details
    Browse the repository at this point in the history

  4. update lib 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    72f50ee View commit details
    Browse the repository at this point in the history

  5. purge! 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    593b250 View commit details
    Browse the repository at this point in the history

  6. change to correct path 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8621ce8 View commit details
    Browse the repository at this point in the history

  7. delete leftovers 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    bc346e9 View commit details
    Browse the repository at this point in the history

  8. check if old config is there 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    fec5ff5 View commit details
    Browse the repository at this point in the history

  9. check for new config 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    f4a15e8 View commit details
    Browse the repository at this point in the history

  10. check for both config files 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8547a9b View commit details
    Browse the repository at this point in the history

  11. cleanup tmp 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a44b57b View commit details
    Browse the repository at this point in the history

  12. change source lib 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a98dbad View commit details
    Browse the repository at this point in the history

  13. SC 

    Signed-off-by: Daniel Hansson <[email protected]>
    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    f53f8c8 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into geoblock-v2

    @enoch85
    enoch85 authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ac1522c View commit details
    Browse the repository at this point in the history